GHA main: Add Alpine Linux job, to CI-test musl libc

kinke · kinke · commit 3ca89538f5db · 2025-01-25T13:03:15.000+01:00
Incl. some test fixes.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -49,6 +49,10 @@ jobs:
             os: ubuntu-22.04
             host_dmd: gdmd-9
             disable_debug_for_dmd_unittests: true # no `-debug` - host frontend too old
+          - job_name: Alpine 3.21 x64, LDC
+            os: ubuntu-latest
+            container_image: alpine:3.21
+            host_dmd: ldmd2
           # macOS
           - job_name: macOS 13 x64, DMD (latest)
             os: macos-13
@@ -74,6 +78,7 @@ jobs:
             model: 32
     name: ${{ matrix.job_name }}
     runs-on: ${{ matrix.os }}
+    container: ${{ matrix.container_image }}
     timeout-minutes: 40
     env:
       # for ci/run.sh:
@@ -90,6 +95,11 @@ jobs:
       run:
         shell: bash
     steps:
+      - name: 'Alpine container: Pre-install bash, git and sudo'
+        if: startsWith(matrix.container_image, 'alpine')
+        shell: sh
+        run: apk add bash git sudo
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 50
@@ -149,20 +159,20 @@ jobs:
       - name: Test dmd
         run: ci/run.sh test_dmd
       - name: Test druntime
-        if: '!matrix.coverage'
+        if: '!matrix.coverage && (success() || failure())'
         run: ci/run.sh test_druntime
       - name: 'Windows x86: Add 32-bit libcurl.dll to PATH (required for Phobos unittests)'
-        if: runner.os == 'Windows' && env.MODEL == '32' && !matrix.coverage
+        if: runner.os == 'Windows' && env.MODEL == '32' && !matrix.coverage && (success() || failure())
         run: |
           # LDC
           echo "$(dirname "$(which $DC)")/../lib32" >> $GITHUB_PATH
           # DMD
           echo "$(dirname "$(which $DC)")/../bin" >> $GITHUB_PATH
       - name: Test phobos
-        if: '!matrix.coverage'
+        if: '!matrix.coverage && (success() || failure())'
         run: ci/run.sh test_phobos
       - name: Test self-compile
-        if: '!matrix.coverage' # already re-built with enabled coverage
+        if: '!matrix.coverage && (success() || failure())' # already re-built with enabled coverage
         run: ENABLE_RELEASE=0 ci/run.sh rebuild
       - name: Upload coverage report
         if: matrix.coverage
diff --git a/ci/cirrusci.sh b/ci/cirrusci.sh
@@ -15,18 +15,24 @@ if [ ! -z ${HOST_DC+x} ] ; then HOST_DMD=${HOST_DC}; fi
 if [ -z ${HOST_DMD+x} ] ; then echo "Variable 'HOST_DMD' needs to be set."; exit 1; fi
 
 if [ "$OS_NAME" == "linux" ]; then
-  export DEBIAN_FRONTEND=noninteractive
-  packages="git-core make g++ gdb gnupg curl libcurl4 tzdata zip unzip xz-utils llvm valgrind libc6-dbg"
-  if [ "$MODEL" == "32" ]; then
-    dpkg --add-architecture i386
-    packages="$packages g++-multilib libcurl4:i386 libc6-dbg:i386"
+  if type -P apk &>/dev/null; then
+    # Alpine
+    apk add git make g++ ldc \
+      bash grep coreutils diffutils curl gdb linux-headers dub
+  else
+    export DEBIAN_FRONTEND=noninteractive
+    packages="git-core make g++ gdb gnupg curl libcurl4 tzdata zip unzip xz-utils llvm valgrind libc6-dbg"
+    if [ "$MODEL" == "32" ]; then
+      dpkg --add-architecture i386
+      packages="$packages g++-multilib libcurl4:i386 libc6-dbg:i386"
+    fi
+    if [ "${HOST_DMD:0:4}" == "gdmd" ]; then
+      # ci/run.sh uses `sudo add-apt-repository ...` to add a PPA repo
+      packages="$packages sudo software-properties-common"
+    fi
+    apt-get -q update
+    apt-get install -yq $packages
   fi
-  if [ "${HOST_DMD:0:4}" == "gdmd" ]; then
-    # ci/run.sh uses `sudo add-apt-repository ...` to add a PPA repo
-    packages="$packages sudo software-properties-common"
-  fi
-  apt-get -q update
-  apt-get install -yq $packages
 elif [ "$OS_NAME" == "osx" ]; then
   # upgrade GNU make
   brew install make
diff --git a/ci/run.sh b/ci/run.sh
@@ -123,6 +123,11 @@ test_dmd() {
         local args=(ARGS="-O -inline -release")
     fi
 
+    if type -P apk &>/dev/null; then
+        # Alpine: no TLS variables support with gdb, https://gitlab.alpinelinux.org/alpine/aports/-/issues/11154
+        rm compiler/test/runnable/gdb4181.d
+    fi
+
     $build_path/dmd -g -i -Icompiler/test -release compiler/test/run.d -ofgenerated/run
     generated/run -j$N --environment MODEL=$MODEL HOST_DMD=$build_path/dmd "${args[@]}"
 }
@@ -262,6 +267,11 @@ install_host_compiler() {
         echo "export DMD=gdmd-$gdc_version" > ~/dlang/gdc-$gdc_version/activate
         echo "deactivate(){ echo;}" >> ~/dlang/gdc-$gdc_version/activate
     fi
+  elif type -P apk &>/dev/null; then
+    # fake install script and create a fake 'activate' script
+    mkdir -p ~/dlang/$HOST_DMD
+    echo "export DMD=$HOST_DMD" > ~/dlang/$HOST_DMD/activate
+    echo "deactivate(){ echo;}" >> ~/dlang/$HOST_DMD/activate
   else
     local install_sh="install.sh"
     download_install_sh "$install_sh"
diff --git a/druntime/test/exceptions/Makefile b/druntime/test/exceptions/Makefile
@@ -1,7 +1,19 @@
-TESTS=stderr_msg unittest_assert invalid_memory_operation unknown_gc static_dtor \
+ifeq ($(OS),linux)
+    # FIXME: detect musl libc robustly; just checking Alpine Linux' apk tool for now
+    ifeq (1,$(shell which apk &>/dev/null && echo 1))
+        IS_MUSL:=1
+    endif
+endif
+
+TESTS=stderr_msg unittest_assert invalid_memory_operation static_dtor \
       future_message refcounted rt_trap_exceptions_drt catch_in_finally \
       message_with_null
 
+# FIXME: segfaults with musl libc
+ifneq ($(IS_MUSL),1)
+TESTS += unknown_gc
+endif
+
 # fails on 32 bit linux
 ifneq ($(OS),linux)
 TESTS += assert_fail
@@ -12,8 +24,11 @@ SED:=sed
 GDB:=gdb
 
 ifeq ($(OS),linux)
-    TESTS+=line_trace line_trace_21656 long_backtrace_trunc rt_trap_exceptions cpp_demangle \
-		   memoryerror_null_read memoryerror_null_write memoryerror_null_call memoryerror_stackoverflow
+    TESTS+=line_trace line_trace_21656 long_backtrace_trunc rt_trap_exceptions cpp_demangle
+    # registerMemoryAssertHandler requires glibc
+    ifneq ($(IS_MUSL),1)
+        TESTS+=memoryerror_null_read memoryerror_null_write memoryerror_null_call memoryerror_stackoverflow
+    endif
     line_trace_dflags:=-L--export-dynamic
 endif
 
diff --git a/druntime/test/importc_compare/Makefile b/druntime/test/importc_compare/Makefile
@@ -1,5 +1,13 @@
 TESTS := importc_compare
 
+# FIXME: fails on Alpine v3.21 with conflicting struct declarations in the C headers:
+# /usr/include/asm-generic/fcntl.h(195): Error: struct `importc_includes.flock` conflicts with struct `importc_includes.flock` at /usr/include/fcntl.h(24)
+ifeq ($(OS),linux)
+    ifeq (1,$(shell which apk &>/dev/null && echo 1))
+        TESTS :=
+    endif
+endif
+
 include ../common.mak
 
 extra_dflags += -d
diff --git a/druntime/test/shared/src/finalize.d b/druntime/test/shared/src/finalize.d
@@ -44,7 +44,7 @@ void main(string[] args)
     auto nf1 = new NoFinalize;
     auto nf2 = new NoFinalizeBig;
 
-    shared size_t finalizeCounter;
+    static shared size_t finalizeCounter;
     SetFinalizeCounter setFinalizeCounter;
     loadSym(h, setFinalizeCounter, "setFinalizeCounter");
     setFinalizeCounter(&finalizeCounter);
@@ -57,8 +57,15 @@ void main(string[] args)
     auto r = Runtime.unloadLibrary(h);
     if (!r)
         assert(0);
-    if (finalizeCounter != 4)
-        assert(0);
+    version (CRuntime_Musl)
+    {
+        // On Musl, dlclose is a no-op
+    }
+    else
+    {
+        if (finalizeCounter != 4)
+            assert(0);
+    }
     if (nf1._finalizeCounter)
         assert(0);
     if (nf2._finalizeCounter)
diff --git a/druntime/test/shared/src/load.d b/druntime/test/shared/src/load.d
@@ -135,21 +135,28 @@ void main(string[] args)
 
     runTests(name);
 
-    // lib is no longer resident
-    name ~= '\0';
-    version (Windows)
+    version (CRuntime_Musl)
     {
-        import core.sys.windows.winbase;
-        assert(!GetModuleHandleA(name.ptr));
+        // On Musl, dlclose is a no-op
     }
     else
     {
-        import core.sys.posix.dlfcn : dlopen, RTLD_LAZY;
-        assert(dlopen(name.ptr, RTLD_LAZY | RTLD_NOLOAD) is null);
+        // lib is no longer resident
+        name ~= '\0';
+        version (Windows)
+        {
+            import core.sys.windows.winbase;
+            assert(!GetModuleHandleA(name.ptr));
+        }
+        else
+        {
+            import core.sys.posix.dlfcn : dlopen, RTLD_LAZY;
+            assert(dlopen(name.ptr, RTLD_LAZY | RTLD_NOLOAD) is null);
+        }
+        name = name[0 .. $-1];
+
+        auto thr = new Thread({runTests(name);});
+        thr.start();
+        thr.join();
     }
-    name = name[0 .. $-1];
-
-    auto thr = new Thread({runTests(name);});
-    thr.start();
-    thr.join();
 }
diff --git a/druntime/test/shared/src/load_13414.d b/druntime/test/shared/src/load_13414.d
@@ -20,17 +20,15 @@ void runTest(string name)
     *pLibSharedStaticDtorHook = &sharedStaticDtorHook;
 
     const unloaded = Runtime.unloadLibrary(h);
+    assert(unloaded);
+    assert(tlsDtor == 1);
     version (CRuntime_Musl)
     {
-        // On Musl, unloadLibrary is a no-op because dlclose is a no-op
-        assert(!unloaded);
-        assert(tlsDtor == 0);
+        // On Musl, dlclose is a no-op
         assert(dtor == 0);
     }
     else
     {
-        assert(unloaded);
-        assert(tlsDtor == 1);
         assert(dtor == 1);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,15 @@ void runTest(string name)`
`20`	`20`	`*pLibSharedStaticDtorHook = &sharedStaticDtorHook;`
`21`	`21`
`22`	`22`	`const unloaded = Runtime.unloadLibrary(h);`
	`23`	`+ assert(unloaded);`
	`24`	`+ assert(tlsDtor == 1);`
`23`	`25`	`version (CRuntime_Musl)`
`24`	`26`	`{`
`25`		`- // On Musl, unloadLibrary is a no-op because dlclose is a no-op`
`26`		`- assert(!unloaded);`
`27`		`- assert(tlsDtor == 0);`
	`27`	`+ // On Musl, dlclose is a no-op`
`28`	`28`	`assert(dtor == 0);`
`29`	`29`	`}`
`30`	`30`	`else`
`31`	`31`	`{`
`32`		`- assert(unloaded);`
`33`		`- assert(tlsDtor == 1);`
`34`	`32`	`assert(dtor == 1);`
`35`	`33`	`}`
`36`	`34`	`}`