From 965cb22e9e53a4701b2fd03bda107f6e66dbd51a Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Sun, 3 May 2026 11:49:13 +0200
Subject: [PATCH] CI updates

---
 .github/workflows/extra-cross-builds.yml |  2 +-
 .github/workflows/llvm-mingw.yml         | 16 +++++++++-------
 src/conf.h                               |  1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/extra-cross-builds.yml b/.github/workflows/extra-cross-builds.yml
index ff6c6704..02606628 100644
--- a/.github/workflows/extra-cross-builds.yml
+++ b/.github/workflows/extra-cross-builds.yml
@@ -111,7 +111,7 @@ jobs:
           done
           ls -ldF /etc/alternatives/*mingw* || true
       - run: dpkg -l
-      - name: Check out code
+      - name: ${{ format('Check out {0} source code', github.ref_name) }}
         run: |
           git config --global --add safe.directory '*' # needed when running in a container
           git clone --branch "$GITHUB_REF_NAME" --depth 1 "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" .
diff --git a/.github/workflows/llvm-mingw.yml b/.github/workflows/llvm-mingw.yml
index 206efa1b..13d17b13 100644
--- a/.github/workflows/llvm-mingw.yml
+++ b/.github/workflows/llvm-mingw.yml
@@ -72,30 +72,32 @@ jobs:
             use_arm64ec: true
             url: 'https://github.com/mstorsjo/llvm-mingw/releases/download/20260421/llvm-mingw-20260421-ucrt-ubuntu-22.04-x86_64.tar.xz'
 
-    name: ${{ format('{0} {1}', matrix.name, matrix.llvm_version) }}
-    runs-on: ubuntu-latest
-    #container: 'ubuntu:22.04'
-    container: 'ubuntu:26.04'
     env:
+      container: 'ubuntu:26.04'
       CMAKE_SYSTEM_NAME: Windows
       xflags: -D_WIN32_WINNT=0x0601
       #xflags: -D_WIN32_WINNT=0x0601 -DDOCTEST_CONFIG_DISABLE
+
+    name: ${{ format('{0} {1}', matrix.name, matrix.llvm_version) }}
+    runs-on: ubuntu-latest
+    #container: ${{ env.container }}
+    container: 'ubuntu:26.04'
     steps:
       - run: uname -a; pwd; id; umask
       - run: ulimit -a || true
-      - name: Install packages
+      - name: ${{ format('Install packages {0}', env.container) }}
         run: |
           dpkg --add-architecture i386
           apt-get update && apt-get upgrade -y
           apt-get install -y --no-install-recommends bash ca-certificates cmake curl file git make parallel strace tar time tree util-linux xz-utils zstd
       - run: dpkg -l
-      - name: Install Wine
+      - name: ${{ format('Install Wine {0}', env.container) }}
         run: |
           apt-get install -y wine wine32:i386 wine64
           ls -ldF /usr/bin/wine* /etc/alternatives/*wine* || true
           mkdir -p -v ~/.wine && wineboot --init
       - run: dpkg -l
-      - name: Check out code
+      - name: ${{ format('Check out {0} source code', github.ref_name) }}
         run: |
           git config --global --add safe.directory '*' # needed when running in a container
           git clone --branch "$GITHUB_REF_NAME" --depth 1 "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" .
diff --git a/src/conf.h b/src/conf.h
index 0fdf1426..acc1c236 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -456,6 +456,7 @@ inline void mem_clear(T *object) noexcept {
     static_assert(std::is_trivially_copyable_v<T>);
     constexpr size_t size = sizeof(*object);
     static_assert(size >= 1 && size <= UPX_RSIZE_MAX_MEM);
+    // NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion)
     memset((void *) object, 0, size);
 }
 // disable some overloads