GHA Alpine: include shared druntime+Phobos too

ldc-developers · Jan 19, 2025 · 243d1b8 · 243d1b8
1 parent 094ab42
commit 243d1b8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/.github/actions/6-integration-test/action.yml b/.github/actions/6-integration-test/action.yml
@@ -15,9 +15,6 @@ runs:
       run: |
         set -eux
         cd ..
-        if type -P apk &>/dev/null; then
-          exit 0 # Alpine: no shared libs
-        fi
         if [[ '${{ runner.os }}' == Windows ]]; then
           # add druntime/Phobos DLL dir to PATH
           export PATH="$PWD/installed/bin:$PATH"

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -61,7 +61,6 @@ jobs:
             # TSan and XRay do not work.
             extra_cmake_flags: >-
               -DBUILD_LTO_LIBS=ON
-              -DBUILD_SHARED_LIBS=OFF
               -DLLVM_IS_SHARED=OFF
               -DLDC_ENABLE_PLUGINS=OFF
               -DLDC_DYNAMIC_COMPILE=OFF

diff --git a/runtime/druntime/test/shared/src/load_13414.d b/runtime/druntime/test/shared/src/load_13414.d
@@ -22,25 +22,15 @@ void runTest(string name)
     *pLibSharedStaticDtorHook = &sharedStaticDtorHook;
 
     const unloaded = Runtime.unloadLibrary(h);
-    version (CRuntime_Musl)
+    assert(unloaded);
+    assert(tlsDtor == 1);
+    version (LDC_darwin)
     {
-        // On Musl, unloadLibrary is a no-op because dlclose is a no-op
-        assert(!unloaded);
-        assert(tlsDtor == 0);
+        // Since 10.13: https://github.com/ldc-developers/ldc/issues/3002
         assert(dtor == 0);
     }
     else
-    {
-        assert(unloaded);
-        assert(tlsDtor == 1);
-        version (LDC_darwin)
-        {
-            // Since 10.13: https://github.com/ldc-developers/ldc/issues/3002
-            assert(dtor == 0);
-        }
-        else
-            assert(dtor == 1);
-    }
+        assert(dtor == 1);
 }
 
 void main(string[] args)