From b6dd61cea832f26d5a953f41e37ab39a60856be7 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Sun, 5 Nov 2023 09:03:38 +0100
Subject: [PATCH] CI updates

---
 .github/workflows/ci.yml                        | 4 ++--
 .github/workflows/weekly-ci-bs-by-hand.yml      | 7 ++-----
 .github/workflows/weekly-ci-cc-alpine-linux.yml | 4 ++--
 .github/workflows/weekly-ci-cc-zigcc.yml        | 4 ++--
 misc/scripts/build_upx_by_hand.sh               | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cbab1a55..7710be6e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ env:
   CTEST_OUTPUT_ON_FAILURE: "ON"
   DEBIAN_FRONTEND: noninteractive
   UPX_CMAKE_BUILD_FLAGS: --verbose
-  # 2023-11-03
-  ZIG_DIST_VERSION: 0.12.0-dev.1390+94cee4fb2
+  # 2023-11-04
+  ZIG_DIST_VERSION: 0.12.0-dev.1396+f6de3ec96
 
 jobs:
   job-rebuild-and-verify-stubs:
diff --git a/.github/workflows/weekly-ci-bs-by-hand.yml b/.github/workflows/weekly-ci-bs-by-hand.yml
index b698bcfd..d4ae1f09 100644
--- a/.github/workflows/weekly-ci-bs-by-hand.yml
+++ b/.github/workflows/weekly-ci-bs-by-hand.yml
@@ -164,17 +164,14 @@ jobs:
         shell: bash
         run: |
           xflags="-static -Wall -Wextra -Werror"
-          # clang uses the MSVC headers, adjust settings
+          # clang uses the MSVC headers and libraries, so adjust settings
           xflags="$xflags -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS"
           export zlib_extra_flags="-DHAVE_VSNPRINTF"
-          export AR=false # link without using $AR
+          export AR_LIBFILE=upx_submodules.lib
           CC="clang $xflags" CXX="clang++ -std=gnu++17 $xflags" bash "./upx with space/misc/scripts/build_upx_by_hand.sh"
-          ls -l "upx with space"/build/by-hand || true
       - name: 'Build by-hand with bash - gcc'
         if: success() || failure() # run this step even if the previous step failed
         shell: bash
         run: |
           xflags="-static -Wall -Wextra -Werror"
-          # gcc uses the MingGW headers, so no extra settings are needed
           CC="gcc $xflags" CXX="g++ -std=gnu++17 $xflags" bash "./upx with space/misc/scripts/build_upx_by_hand.sh"
-          ls -l "upx with space"/build/by-hand || true
diff --git a/.github/workflows/weekly-ci-cc-alpine-linux.yml b/.github/workflows/weekly-ci-cc-alpine-linux.yml
index 230373df..dff83f9b 100644
--- a/.github/workflows/weekly-ci-cc-alpine-linux.yml
+++ b/.github/workflows/weekly-ci-cc-alpine-linux.yml
@@ -38,8 +38,8 @@ jobs:
           - { container: 'alpine:3.16', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 } # May 2022: C++2b; clang-13 & gcc-11
           - { container: 'alpine:3.17', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
           - { container: 'alpine:3.18', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
-          - { container: 'alpine:edge', use_cxx20: 1, use_cxx23: 1, use_lto: 1 }
-          - { container: 'i386/alpine:edge', use_cxx20: 1, use_cxx23: 1, use_lto: 1 }
+          - { container: 'alpine:edge', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
+          - { container: 'i386/alpine:edge', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
           # more 32-bit i386 versions, just for testing
           # { container: 'i386/alpine:3.9' }  # clang-5,  gcc-8; BROKEN: clang -m32 problem
           - { container: 'i386/alpine:3.10' } # clang-8,  gcc-8
diff --git a/.github/workflows/weekly-ci-cc-zigcc.yml b/.github/workflows/weekly-ci-cc-zigcc.yml
index 1f420ab4..5d5361d1 100644
--- a/.github/workflows/weekly-ci-cc-zigcc.yml
+++ b/.github/workflows/weekly-ci-cc-zigcc.yml
@@ -11,8 +11,8 @@ env:
   CMAKE_REQUIRED_QUIET: "OFF"
   CTEST_OUTPUT_ON_FAILURE: "ON"
   DEBIAN_FRONTEND: noninteractive
-  # 2023-11-03
-  ZIG_DIST_VERSION: 0.12.0-dev.1390+94cee4fb2
+  # 2023-11-04
+  ZIG_DIST_VERSION: 0.12.0-dev.1396+f6de3ec96
 
 jobs:
   job-linux-zigcc: # uses cmake + make
diff --git a/misc/scripts/build_upx_by_hand.sh b/misc/scripts/build_upx_by_hand.sh
index af4cb309..1adeb632 100755
--- a/misc/scripts/build_upx_by_hand.sh
+++ b/misc/scripts/build_upx_by_hand.sh
@@ -128,7 +128,7 @@ if test "x$AR" = "x"; then
     # link without using $AR
     run "CXX upx"    $CXX -o upx *.o */*.o
 else
-    run "AR  libupx" $AR rcs libupx_submodules.a */*.o
+    run "AR  libupx" $AR rcs ${AR_LIBFILE:-libupx_submodules.a} */*.o
     run "CXX upx"    $CXX -o upx *.o -L. -lupx_submodules
 fi
 echo "# current directory: '$(pwd)'"