From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Wed, 1 Jan 2025 22:38:12 +0000 (-0800)
Subject: Upgrade CI from Clang-11 to Clang 15 for Ubuntu 24. #1840
X-Git-Tag: 2.2.4~19
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=707705229228216b5eb2b93490664f8439f138df;p=thirdparty%2Fzlib-ng.git

Upgrade CI from Clang-11 to Clang 15 for Ubuntu 24. #1840
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 02f98272..4a3596c6 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -357,7 +357,7 @@ jobs:
              # Limit parallel test jobs to prevent wine errors
             parallels-jobs: 1
 
-          - name: Ubuntu 20.04 Clang
+          - name: Ubuntu 20.04 Clang 6
             os: ubuntu-20.04
             compiler: clang-6.0
             cxx-compiler: clang++-6.0
@@ -365,72 +365,72 @@ jobs:
 
           - name: Ubuntu Clang
             os: ubuntu-latest
-            compiler: clang-11
-            cxx-compiler: clang++-11
-            packages: clang-11 llvm-11 llvm-11-tools
-            gcov-exec: llvm-cov-11 gcov
+            compiler: clang-15
+            cxx-compiler: clang++-15
+            packages: clang-15 llvm-15 llvm-15-tools
+            gcov-exec: llvm-cov-15 gcov
             codecov: ubuntu_clang
 
           # Check for undefined symbols in the version script for the modern api
           - name: Ubuntu Clang Undefined Symbols
             os: ubuntu-latest
-            compiler: clang-11
-            cxx-compiler: clang++-11
+            compiler: clang-15
+            cxx-compiler: clang++-15
             cmake-args: -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld -Wl,--no-undefined-version" -DZLIBNG_ENABLE_TESTS=OFF
             build-shared: ON
-            packages: clang-11 llvm-11 lld
+            packages: clang-15 llvm-15 lld
 
           # Check for undefined symbols in the version script for the compat api
           - name: Ubuntu Clang Undefined Symbols Compat
             os: ubuntu-latest
-            compiler: clang-11
-            cxx-compiler: clang++-11
+            compiler: clang-15
+            cxx-compiler: clang++-15
             cmake-args: -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld -Wl,--no-undefined-version" -DZLIBNG_ENABLE_TESTS=OFF -DZLIB_COMPAT=ON
             build-shared: ON
-            packages: clang-11 llvm-11 lld
+            packages: clang-15 llvm-15 lld
 
           - name: Ubuntu Clang Inflate Strict
             os: ubuntu-latest
-            compiler: clang-11
-            cxx-compiler: clang++-11
+            compiler: clang-15
+            cxx-compiler: clang++-15
             cmake-args: -DWITH_INFLATE_STRICT=ON
-            packages: clang-11 llvm-11 llvm-11-tools
-            gcov-exec: llvm-cov-11 gcov
+            packages: clang-15 llvm-15 llvm-15-tools
+            gcov-exec: llvm-cov-15 gcov
             codecov: ubuntu_clang_inflate_strict
 
           - name: Ubuntu Clang Inflate Allow Invalid Dist
             os: ubuntu-latest
-            compiler: clang-11
-            cxx-compiler: clang++-11
+            compiler: clang-15
+            cxx-compiler: clang++-15
             cmake-args: -DWITH_INFLATE_ALLOW_INVALID_DIST=ON
-            packages: clang-11 llvm-11 llvm-11-tools
-            gcov-exec: llvm-cov-11 gcov
+            packages: clang-15 llvm-15 llvm-15-tools
+            gcov-exec: llvm-cov-15 gcov
             codecov: ubuntu_clang_inflate_allow_invalid_dist
 
           - name: Ubuntu Clang Reduced Memory
             os: ubuntu-latest
-            compiler: clang-11
-            cxx-compiler: clang++-11
+            compiler: clang-15
+            cxx-compiler: clang++-15
             cmake-args: -DWITH_REDUCED_MEM=ON
-            packages: clang-11 llvm-11 llvm-11-tools
-            gcov-exec: llvm-cov-11 gcov
+            packages: clang-15 llvm-15 llvm-15-tools
+            gcov-exec: llvm-cov-15 gcov
             codecov: ubuntu_clang_reduced_mem
 
           - name: Ubuntu Clang Memory Map
             os: ubuntu-latest
-            compiler: clang-11
-            cxx-compiler: clang++-11
+            compiler: clang-15
+            cxx-compiler: clang++-15
             cflags: -DUSE_MMAP
-            packages: clang-11 llvm-11 llvm-11-tools
-            gcov-exec: llvm-cov-11 gcov
+            packages: clang-15 llvm-15 llvm-15-tools
+            gcov-exec: llvm-cov-15 gcov
             codecov: ubuntu_clang_mmap
 
           - name: Ubuntu Clang Debug
             os: ubuntu-latest
-            compiler: clang-11
-            cxx-compiler: clang++-11
-            packages: clang-11 llvm-11 llvm-11-tools
-            gcov-exec: llvm-cov-11 gcov
+            compiler: clang-15
+            cxx-compiler: clang++-15
+            packages: clang-15 llvm-15 llvm-15-tools
+            gcov-exec: llvm-cov-15 gcov
             codecov: ubuntu_clang_debug
             build-config: Debug
 
diff --git a/.github/workflows/pigz.yml b/.github/workflows/pigz.yml
index e207db42..a101c0cc 100644
--- a/.github/workflows/pigz.yml
+++ b/.github/workflows/pigz.yml
@@ -25,15 +25,15 @@ jobs:
           - name: Ubuntu Clang
             os: ubuntu-latest
             compiler: clang
-            packages: llvm-11 llvm-11-tools
-            gcov-exec: llvm-cov-11 gcov
+            packages: llvm-15 llvm-15-tools
+            gcov-exec: llvm-cov-15 gcov
             codecov: ubuntu_clang_pigz
 
           - name: Ubuntu Clang No Optim
             os: ubuntu-latest
             compiler: clang
-            packages: llvm-11 llvm-11-tools
-            gcov-exec: llvm-cov-11 gcov
+            packages: llvm-15 llvm-15-tools
+            gcov-exec: llvm-cov-15 gcov
             codecov: ubuntu_clang_pigz_no_optim
             cmake-args: -DWITH_OPTIM=OFF
 
@@ -41,8 +41,8 @@ jobs:
           - name: Ubuntu Clang No Threads
             os: ubuntu-latest
             compiler: clang
-            packages: llvm-11 llvm-11-tools
-            gcov-exec: llvm-cov-11 gcov
+            packages: llvm-15 llvm-15-tools
+            gcov-exec: llvm-cov-15 gcov
             codecov: ubuntu_clang_pigz_no_threads
             cmake-args: -DWITH_THREADS=OFF -DPIGZ_VERSION=v2.6