Skip to content

Commit e108778

Browse files
committed
GHA/macos: replace deleted gcc-12 with gcc-13/gcc-14
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: actions/runner-images@f7e2c3f Ref: actions/runner-images#13249 Ref: actions/runner-images@1c1351b Ref: actions/runner-images#13253 Closes curl#19387
1 parent 904e7ec commit e108778

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/macos.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ jobs:
217217
strategy:
218218
fail-fast: false
219219
matrix:
220-
compiler: [clang, llvm@18, gcc-12]
220+
compiler: [clang, llvm@18, gcc-13]
221221
build:
222222
# autotools
223223
- name: '!ssl !debug brotli zstd'
@@ -226,7 +226,7 @@ jobs:
226226
configure: --without-ssl --with-brotli --with-zstd
227227
xcode: '' # default Xcode. Set it once to silence actionlint.
228228
- name: '!ssl !debug'
229-
compiler: gcc-12
229+
compiler: gcc-13
230230
configure: --without-ssl
231231
- name: '!ssl'
232232
compiler: clang
@@ -320,7 +320,7 @@ jobs:
320320
install: gnutls nettle krb5
321321
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
322322
- name: 'aws-lc'
323-
compiler: gcc-12
323+
compiler: gcc-13
324324
install: aws-lc
325325
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
326326
- name: 'Rustls'
@@ -342,10 +342,10 @@ jobs:
342342
exclude:
343343
# opt out jobs from combinations that have the compiler set manually
344344
- { compiler: llvm@18, build: { compiler: 'clang' } }
345-
- { compiler: llvm@18, build: { compiler: 'gcc-12' } }
346-
- { compiler: gcc-12, build: { compiler: 'clang' } }
347-
- { compiler: gcc-12, build: { compiler: 'llvm@18' } }
348-
- { compiler: clang, build: { compiler: 'gcc-12' } }
345+
- { compiler: llvm@18, build: { compiler: 'gcc-13' } }
346+
- { compiler: gcc-13, build: { compiler: 'clang' } }
347+
- { compiler: gcc-13, build: { compiler: 'llvm@18' } }
348+
- { compiler: clang, build: { compiler: 'gcc-13' } }
349349
- { compiler: clang, build: { compiler: 'llvm@18' } }
350350

351351
steps:
@@ -557,7 +557,7 @@ jobs:
557557
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
558558
# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
559559
# https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
560-
compiler: [gcc-12, gcc-13, gcc-15, llvm@15, llvm@18, llvm@20, clang]
560+
compiler: [gcc-13, gcc-14, gcc-15, llvm@15, llvm@18, llvm@20, clang]
561561
# Xcode support matrix as of 2025-10, with default macOS SDK versions and OS names, years:
562562
# * = default Xcode on the runner.
563563
# macos-14: 15.0.1, 15.1, 15.2, 15.3,*15.4
@@ -579,9 +579,9 @@ jobs:
579579
- { image: macos-15, compiler: 'llvm@20' }
580580
- { image: macos-26, compiler: 'llvm@15' }
581581
- { image: macos-26, compiler: 'llvm@18' }
582-
- { image: macos-26, compiler: 'gcc-12' }
583582
# Reduce build combinations, by dropping less interesting ones
584-
- { compiler: gcc-13, build: cmake }
583+
- { image: macos-26, compiler: 'gcc-13' }
584+
- { compiler: gcc-14, build: cmake }
585585
- { compiler: gcc-15, build: autotools }
586586
steps:
587587
- name: 'install autotools'

0 commit comments

Comments
 (0)