]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
GHA/macos: replace deleted gcc-12 with gcc-13/gcc-14
authorViktor Szakats <commit@vsz.me>
Thu, 6 Nov 2025 20:10:12 +0000 (21:10 +0100)
committerViktor Szakats <commit@vsz.me>
Thu, 6 Nov 2025 21:18:27 +0000 (22:18 +0100)
GitHub dropped gcc-12 for the remaining two macos runner images.
Replace it with gcc-13 in normal jobs, and gcc-14 in combination jobs.

Ref: https://github.com/actions/runner-images/commit/f7e2c3f34b4985282b39ba42de9f6862a2f8a242
Ref: https://github.com/actions/runner-images/pull/13249

Ref: https://github.com/actions/runner-images/commit/1c1351b6350d920e6c5c524f3eb80cc48c8069a4
Ref: https://github.com/actions/runner-images/pull/13253

Closes #19387

.github/workflows/macos.yml

index 20585e7b7db4ed51fec7784118afa473b8ee0419..0e0d03bc4f014ba5038eb1cd1c217d41b36ae73f 100644 (file)
@@ -217,7 +217,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: [clang, llvm@18, gcc-12]
+        compiler: [clang, llvm@18, gcc-13]
         build:
           # autotools
           - name: '!ssl !debug brotli zstd'
@@ -226,7 +226,7 @@ jobs:
             configure: --without-ssl --with-brotli --with-zstd
             xcode: ''  # default Xcode. Set it once to silence actionlint.
           - name: '!ssl !debug'
-            compiler: gcc-12
+            compiler: gcc-13
             configure: --without-ssl
           - name: '!ssl'
             compiler: clang
@@ -320,7 +320,7 @@ jobs:
             install: gnutls nettle krb5
             generate: -DENABLE_DEBUG=ON -DCURL_USE_GNUTLS=ON -DCURL_USE_OPENSSL=OFF -DCURL_USE_GSSAPI=ON -DGSS_ROOT_DIR=/opt/homebrew/opt/krb5 -DCURL_DISABLE_LDAP=ON -DUSE_SSLS_EXPORT=ON
           - name: 'aws-lc'
-            compiler: gcc-12
+            compiler: gcc-13
             install: aws-lc
             generate: -DENABLE_DEBUG=ON -DCURL_USE_OPENSSL=ON -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/aws-lc -DUSE_ECH=ON -DCURL_DISABLE_LDAP=ON -DUSE_SSLS_EXPORT=ON
           - name: 'Rustls'
@@ -342,10 +342,10 @@ jobs:
         exclude:
           # opt out jobs from combinations that have the compiler set manually
           - { compiler: llvm@18, build: { compiler: 'clang' } }
-          - { compiler: llvm@18, build: { compiler: 'gcc-12' } }
-          - { compiler: gcc-12, build: { compiler: 'clang' } }
-          - { compiler: gcc-12, build: { compiler: 'llvm@18' } }
-          - { compiler: clang, build: { compiler: 'gcc-12' } }
+          - { compiler: llvm@18, build: { compiler: 'gcc-13' } }
+          - { compiler: gcc-13, build: { compiler: 'clang' } }
+          - { compiler: gcc-13, build: { compiler: 'llvm@18' } }
+          - { compiler: clang, build: { compiler: 'gcc-13' } }
           - { compiler: clang, build: { compiler: 'llvm@18' } }
 
     steps:
@@ -557,7 +557,7 @@ jobs:
         # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
         # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
         # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
-        compiler: [gcc-12, gcc-13, gcc-15, llvm@15, llvm@18, llvm@20, clang]
+        compiler: [gcc-13, gcc-14, gcc-15, llvm@15, llvm@18, llvm@20, clang]
         # Xcode support matrix as of 2025-10, with default macOS SDK versions and OS names, years:
         # * = default Xcode on the runner.
         # macos-14: 15.0.1, 15.1, 15.2, 15.3,*15.4
@@ -579,9 +579,9 @@ jobs:
           - { image: macos-15, compiler: 'llvm@20' }
           - { image: macos-26, compiler: 'llvm@15' }
           - { image: macos-26, compiler: 'llvm@18' }
-          - { image: macos-26, compiler: 'gcc-12' }
           # Reduce build combinations, by dropping less interesting ones
-          - { compiler: gcc-13, build: cmake }
+          - { image: macos-26, compiler: 'gcc-13' }
+          - { compiler: gcc-14, build: cmake }
           - { compiler: gcc-15, build: autotools }
     steps:
       - name: 'install autotools'