Skip to content

Commit c95a797

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 e9eaac9 commit c95a797

File tree

1 file changed

+29
-5
lines changed

1 file changed

+29
-5
lines changed

.github/workflows/cmake.yml

+29-5
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,7 +28,16 @@ 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
3143
run: cmake --build ${{github.workspace}}/build --target check-generated
@@ -39,7 +51,12 @@ jobs:
3951

4052
windows-build:
4153
name: Build - Windows
42-
runs-on: windows-latest
54+
strategy:
55+
matrix:
56+
config:
57+
- {os: 'windows-2019'}
58+
- {os: 'windows-2022'}
59+
runs-on: ${{matrix.config.os}}
4360

4461
steps:
4562
- uses: actions/checkout@v3
@@ -52,7 +69,14 @@ jobs:
5269
run: python3 -m pip install -r third_party/requirements.txt
5370

5471
- 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
72+
run: >
73+
cmake
74+
-B${{github.workspace}}/build
75+
-DCMAKE_POLICY_DEFAULT_CMP0094=NEW
76+
-DUR_ENABLE_TRACING=ON
77+
-DUR_DEVELOPER_MODE=ON
78+
-DUR_BUILD_TESTS=ON
79+
-DUR_FORMAT_CPP_STYLE=ON
5680
5781
- name: Generate source from spec, check for uncommitted diff
5882
run: cmake --build ${{github.workspace}}/build --target check-generated --config ${{env.BUILD_TYPE}}

0 commit comments

Comments
 (0)