Skip to content

Commit 2b92dac

Browse files
committed
Update workflows
1 parent e7fe17e commit 2b92dac

File tree

1 file changed

+5
-31
lines changed

1 file changed

+5
-31
lines changed

.github/workflows/examples.yml

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,20 @@ jobs:
1616
matrix:
1717
os: [ubuntu-24.04, windows-latest, macos-latest]
1818
build_type: [Debug, Release]
19-
c_compiler: [gcc, clang, cl]
20-
include:
21-
# - os: windows-latest
22-
# c_compiler: cl
23-
# cpp_compiler: cl
24-
- os: ubuntu-24.04
25-
c_compiler: gcc
26-
cpp_compiler: g++
27-
# - os: ubuntu-latest
28-
# c_compiler: clang
29-
# cpp_compiler: clang++
19+
cxx_compiler: [g++, clang++, cl]
3020
exclude:
3121
- os: windows-latest
3222
- os: macos-latest
33-
- c_compiler: clang
3423
- os: windows-latest
35-
c_compiler: gcc
24+
cxx_compiler: g++
3625
- os: windows-latest
37-
c_compiler: clang
38-
- os: ubuntu-24.04
39-
c_compiler: cl
26+
cxx_compiler: clang++
4027
- os: ubuntu-24.04
41-
c_compiler: cl
28+
cxx_compiler: cl
4229

4330
steps:
4431
- uses: actions/checkout@v4
4532

46-
# - name: Setup compiler
47-
# if: matrix.os == 'ubuntu-24.04'
48-
# run: |
49-
# sudo apt-get update
50-
# sudo apt-get install -y software-properties-common
51-
# sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
52-
# sudo apt-get install -y gcc-14 g++-14
53-
# sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 140
54-
# sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 140
55-
# sudo update-alternatives --config gcc
56-
# sudo update-alternatives --config g++
57-
5833
- name: Set reusable strings
5934
id: strings
6035
shell: bash
@@ -64,8 +39,7 @@ jobs:
6439
- name: Configure CMake
6540
run: >
6641
cmake -B ${{ steps.strings.outputs.build-output-dir }}
67-
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
68-
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
42+
-DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }}
6943
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
7044
-S ${{ github.workspace }}/examples
7145

0 commit comments

Comments
 (0)