Skip to content

Commit 37c7100

Browse files
authored
Merge pull request #192 from edgar-bonet/gcc-12
linux_and_macos.yml: Use gcc-12 instead of gcc-11
2 parents 3e0dcee + aa975fc commit 37c7100

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

.github/workflows/linux_and_macos.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,38 @@ jobs:
2323
matrix:
2424
include:
2525
- cc: gcc-14
26-
cxx: g++-14
2726
clang_major_version: null
2827
clang_repo_suffix: null
2928
make: make
3029
runs-on: ubuntu-24.04
3130
- cc: clang-18
32-
cxx: clang++-18
3331
clang_major_version: 18
3432
clang_repo_suffix: -18
3533
make: bmake
3634
runs-on: ubuntu-22.04
3735
- cc: musl-gcc
38-
cxx: 'false'
3936
clang_major_version: null
4037
clang_repo_suffix: null
4138
make: bmake
4239
runs-on: ubuntu-22.04
43-
- cc: gcc-11
44-
cxx: g++-11
40+
- cc: gcc-12
4541
clang_major_version: null
4642
clang_repo_suffix: null
4743
make: make
4844
runs-on: macos-12
4945
- cc: gcc-13
50-
cxx: g++-13
5146
clang_major_version: null
5247
clang_repo_suffix: null
5348
make: bmake
5449
runs-on: macos-12
5550
- cc: clang-15
56-
cxx: clang++-15
5751
clang_major_version: 15
5852
clang_repo_suffix: null
5953
make: bsdmake
6054
runs-on: macos-12
6155
steps:
6256
- name: Add Clang/LLVM repositories
63-
if: "${{ runner.os == 'Linux' && contains(matrix.cxx, 'clang') }}"
57+
if: "${{ runner.os == 'Linux' && contains(matrix.cc, 'clang') }}"
6458
run: |-
6559
set -x
6660
source /etc/os-release
@@ -86,14 +80,14 @@ jobs:
8680
coreutils
8781
8882
- name: Install build dependency Clang ${{ matrix.clang_major_version }}
89-
if: "${{ runner.os == 'Linux' && contains(matrix.cxx, 'clang') }}"
83+
if: "${{ runner.os == 'Linux' && contains(matrix.cc, 'clang') }}"
9084
run: |-
9185
sudo apt-get install --yes --no-install-recommends -V \
9286
clang-${{ matrix.clang_major_version }} \
9387
libclang-rt-${{ matrix.clang_major_version }}-dev
9488
9589
- name: Add versioned aliases for Clang ${{ matrix.clang_major_version }}
96-
if: "${{ runner.os == 'macOS' && contains(matrix.cxx, 'clang') }}"
90+
if: "${{ runner.os == 'macOS' && contains(matrix.cc, 'clang') }}"
9791
run: |-
9892
set -x
9993
sudo ln -s "$(brew --prefix llvm@${{ matrix.clang_major_version }})"/bin/clang /usr/local/bin/clang-${{ matrix.clang_major_version }}
@@ -145,7 +139,6 @@ jobs:
145139
- name: 'Build'
146140
env:
147141
CC: ${{ matrix.cc }}
148-
CXX: ${{ matrix.cxx }}
149142
MAKE: ${{ matrix.make }}
150143
run: |-
151144
set -x

0 commit comments

Comments
 (0)