CI updates

.github/workflows/test-minimal-alpinelinux.yml

@@ -15,7 +15,7 @@ jobs:
   job-alpinelinux-clang-static: # uses cmake + make
     if: true
     strategy: { matrix: { container: ['alpine:edge','i386/alpine:edge'] } }
-    name: ${{ format('clang {0}', matrix.container) }}
+    name: ${{ format('clang-static {0}', matrix.container) }}
     runs-on: ubuntu-latest
     container: ${{ matrix.container }}
     steps:
@@ -42,7 +42,7 @@ jobs:
   job-alpinelinux-gcc-static: # uses cmake + make
     if: true
     strategy: { matrix: { container: ['alpine:edge','i386/alpine:edge'] } }
-    name: ${{ format('gcc {0}', matrix.container) }}
+    name: ${{ format('gcc-static {0}', matrix.container) }}
     runs-on: ubuntu-latest
     container: ${{ matrix.container }}
     steps:

.github/workflows/test-minimal-chimeralinux.yml

@@ -1,6 +1,6 @@
 # Copyright (C) Markus Franz Xaver Johannes Oberhumer
 # test minimal number of packages required for building UPX under Chimera Linux
-#   clang: apk add clang cmake curl gmake gtar
+#   clang: apk add bsdtar clang cmake curl gmake
 #
 
 name: 'Test - Minimal Chimera build'
@@ -21,8 +21,8 @@ jobs:
     steps:
       - name: ${{ format('Build clang {0}', matrix.container) }}
         run: |
-          apk update && apk upgrade && apk add clang cmake curl gmake gtar
+          apk update && apk upgrade && apk add bsdtar clang cmake curl gmake
-          for p in make tar; do ln -s -v ../../bin/g$p /usr/local/bin/$p; done
+          for p in make; do ln -s -v ../../bin/g$p /usr/local/bin/$p; done
           curl -OL https://github.com/upx/upx/releases/download/v4.2.1/upx-4.2.1-src.tar.xz
           tar -xoaf upx-*-src.tar.xz
           cd upx-*-src
@@ -43,16 +43,16 @@ jobs:
   job-chimeralinux-clang-static: # uses cmake + make
     if: true
     strategy: { matrix: { container: ['chimeralinux/chimera:latest'] } }
-    name: ${{ format('clang {0}', matrix.container) }}
+    name: ${{ format('clang-static {0}', matrix.container) }}
     runs-on: ubuntu-latest
     container: ${{ matrix.container }}
     steps:
       - name: ${{ format('Build clang {0}', matrix.container) }}
         run: |
-          apk update && apk upgrade && apk add clang cmake curl gmake gtar
+          apk update && apk upgrade && apk add bsdtar clang cmake curl gmake
-          for p in make tar; do ln -s -v ../../bin/g$p /usr/local/bin/$p; done
+          for p in make; do ln -s -v ../../bin/g$p /usr/local/bin/$p; done
-          # install -static packages
+          # install devel-static packages
-          apk add libcxx-devel-static musl-devel-static
+          apk add libatomic-chimera-devel-static libcxx-devel-static musl-devel-static
           curl -OL https://github.com/upx/upx/releases/download/v4.2.1/upx-4.2.1-src.tar.xz
           tar -xoaf upx-*-src.tar.xz
           cd upx-*-src

.github/workflows/weekly-ci-cc-alpine-mingw.yml

@@ -155,7 +155,7 @@ jobs:
           cd build/extra/cross-windows-mingw64/debug
           [[ -f upx && ! -f upx.exe ]] && mv -i -v upx upx.exe
           pwd; file ./upx.exe
-          wine=wine64
+          wine=wine
           tt='./upx.exe'
           $wine ./upx.exe --version-short
           $wine ./upx.exe --sysinfo -v
@@ -174,7 +174,7 @@ jobs:
           cd build/extra/cross-windows-mingw64/release
           [[ -f upx && ! -f upx.exe ]] && mv -i -v upx upx.exe
           pwd; file ./upx.exe
-          wine=wine64
+          wine=wine
           tt='./upx.exe'
           $wine ./upx.exe --version-short
           $wine ./upx.exe --sysinfo -v
@@ -200,3 +200,19 @@ jobs:
       - name: 'Run ctest tests under Wine - mingw64/release'
         if: ${{ matrix.wine }}
         run: 'make -C build/extra/cross-windows-mingw64/release test'
+
+      - name: 'Mimic ctest tests under Wine - mingw32/debug'
+        if: ${{ matrix.wine && matrix.i686_mingw }}
+        run: 'env -C build/extra/cross-windows-mingw32/debug upx_exe=./upx.exe upx_exe_runner=wine bash "$PWD"/misc/testsuite/mimic_ctest.sh'
+
+      - name: 'Mimic ctest tests under Wine - mingw32/release'
+        if: ${{ matrix.wine && matrix.i686_mingw }}
+        run: 'env -C build/extra/cross-windows-mingw32/release upx_exe=./upx.exe upx_exe_runner=wine bash "$PWD"/misc/testsuite/mimic_ctest.sh'
+
+      - name: 'Mimic ctest tests under Wine - mingw64/debug'
+        if: ${{ matrix.wine }}
+        run: 'env -C build/extra/cross-windows-mingw64/debug upx_exe=./upx.exe upx_exe_runner=wine bash "$PWD"/misc/testsuite/mimic_ctest.sh'
+
+      - name: 'Mimic ctest tests under Wine - mingw64/release'
+        if: ${{ matrix.wine }}
+        run: 'env -C build/extra/cross-windows-mingw64/release upx_exe=./upx.exe upx_exe_runner=wine bash "$PWD"/misc/testsuite/mimic_ctest.sh'