Skip to content

Commit ada2c8e

Browse files
committed
[ci] Extend OS testing matrix
Partially address #457 by adding Ubuntu 20.04 and Windows Server 2019 to the testing matrix. These are the low hanging fruit, beyond these additions we'll need to use container images.
1 parent 012a8d3 commit ada2c8e

File tree

1 file changed

+31
-5
lines changed

1 file changed

+31
-5
lines changed

.github/workflows/cmake.yml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ env:
88
jobs:
99
ubuntu-build:
1010
name: Build - Ubuntu
11-
runs-on: ubuntu-latest
1211
strategy:
1312
matrix:
14-
compiler: [ {cxx: g++, c: gcc}, {cxx: clang++, c: clang} ]
13+
config:
14+
- {os: 'ubuntu-20.04', compiler: {c: gcc, cxx: g++}}
15+
- {os: 'ubuntu-22.04', compiler: {c: gcc, cxx: g++}}
16+
- {os: 'ubuntu-22.04', compiler: {c: clang, cxx: clang++}}
17+
runs-on: ${{matrix.config.os}}
1518

1619
steps:
1720
- uses: actions/checkout@v3
@@ -25,9 +28,19 @@ jobs:
2528
run: pip install -r third_party/requirements.txt
2629

2730
- name: Configure CMake
28-
run: cmake -B ${{github.workspace}}/build -D CMAKE_C_COMPILER=${{matrix.compiler.c}} -D CMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} -DUR_ENABLE_TRACING=ON -DUR_DEVELOPER_MODE=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUR_BUILD_TESTS=ON -DUR_FORMAT_CPP_STYLE=ON
31+
run: >
32+
cmake
33+
-B${{github.workspace}}/build
34+
-DCMAKE_C_COMPILER=${{matrix.config.compiler.c}}
35+
-DCMAKE_CXX_COMPILER=${{matrix.config.compiler.cxx}}
36+
-DUR_ENABLE_TRACING=ON
37+
-DUR_DEVELOPER_MODE=ON
38+
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
39+
-DUR_BUILD_TESTS=ON
40+
-DUR_FORMAT_CPP_STYLE=ON
2941
3042
- name: Generate source from spec, check for uncommitted diff
43+
if: ${{matrix.config.os}} == "ubuntu-22.04"
3144
run: cmake --build ${{github.workspace}}/build --target check-generated
3245

3346
- name: Build
@@ -39,7 +52,12 @@ jobs:
3952

4053
windows-build:
4154
name: Build - Windows
42-
runs-on: windows-latest
55+
strategy:
56+
matrix:
57+
config:
58+
- {os: 'windows-2019'}
59+
- {os: 'windows-2022'}
60+
runs-on: ${{matrix.config.os}}
4361

4462
steps:
4563
- uses: actions/checkout@v3
@@ -52,9 +70,17 @@ jobs:
5270
run: python3 -m pip install -r third_party/requirements.txt
5371

5472
- name: Configure CMake
55-
run: cmake -DCMAKE_POLICY_DEFAULT_CMP0094=NEW -DUR_ENABLE_TRACING=ON -DUR_DEVELOPER_MODE=ON -DUR_BUILD_TESTS=ON -B ${{github.workspace}}/build -DUR_FORMAT_CPP_STYLE=ON
73+
run: >
74+
cmake
75+
-B${{github.workspace}}/build
76+
-DCMAKE_POLICY_DEFAULT_CMP0094=NEW
77+
-DUR_ENABLE_TRACING=ON
78+
-DUR_DEVELOPER_MODE=ON
79+
-DUR_BUILD_TESTS=ON
80+
-DUR_FORMAT_CPP_STYLE=ON
5681
5782
- name: Generate source from spec, check for uncommitted diff
83+
if: ${{matrix.config.os}} == "windows-2022"
5884
run: cmake --build ${{github.workspace}}/build --target check-generated --config ${{env.BUILD_TYPE}}
5985

6086
- name: Build all

0 commit comments

Comments
 (0)