From ffd3efe5fa4674e4103038851959114a9b74c1fd Mon Sep 17 00:00:00 2001 From: WerWolv Date: Thu, 20 Jul 2023 20:59:06 +0200 Subject: [PATCH] git: Disable .NET scripts in AppImage since it hangs on startup --- .github/workflows/build.yml | 5 ----- .../source/loaders/dotnet/dotnet_loader.cpp | 12 +++--------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6df8668cb..bc6b1e32a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -363,11 +363,6 @@ jobs: sudo chmod +x /usr/local/bin/appimagetool sudo pip3 install git+https://github.com/iTrooz/appimage-builder@dpkg-package-versions - - name: ⬇️ Install .NET - uses: actions/setup-dotnet@v3 - with: - dotnet-version: '7.0.x' - - name: 📜 Set version variable run: | echo "IMHEX_VERSION=`cat VERSION`" >> $GITHUB_ENV diff --git a/plugins/script_loader/source/loaders/dotnet/dotnet_loader.cpp b/plugins/script_loader/source/loaders/dotnet/dotnet_loader.cpp index 2c1a2e2bf..c18e13f6f 100644 --- a/plugins/script_loader/source/loaders/dotnet/dotnet_loader.cpp +++ b/plugins/script_loader/source/loaders/dotnet/dotnet_loader.cpp @@ -50,7 +50,7 @@ namespace hex::script::loader { } #else void *loadLibrary(const char_t *path) { - void *h = dlopen(path, RTLD_LAZY | RTLD_LOCAL); + void *h = dlopen(path, RTLD_LAZY); return h; } @@ -135,14 +135,8 @@ namespace hex::script::loader { bool DotNetLoader::initialize() { - try { - AT_FIRST_TIME { - if (!loadHostfxr()) { - throw std::runtime_error("Failed to load hostfxr"); - } - }; - } catch (const std::exception &e) { - log::error("Failed to initialize DotNetLoader: {}", e.what()); + if (!loadHostfxr()) { + log::error("Failed to initialize dotnet loader, could not load hostfxr"); return false; }