Skip to content

Commit 50c59c2

Browse files
committed
Add C++20 windows test but only run it on main ci, not on pr ci
1 parent 1a65061 commit 50c59c2

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

.github/workflows/cpp_matrix_full.json

+16-5
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,36 @@
55
"runs_on": "ubuntu-latest-16-cores",
66
"cache_key": "build-linux",
77
"extra_env_vars": "RERUN_USE_ASAN=1 RERUN_SET_CXX_VERSION=17 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp",
8-
"additional_commands": "pixi run -e cpp cpp-docs"
8+
"additional_commands": "pixi run -e cpp cpp-docs",
9+
"pr_ci": true
910
},
1011
{
1112
"name": "Linux x64, C++20",
1213
"runs_on": "ubuntu-latest-16-cores",
1314
"cache_key": "build-linux",
14-
"extra_env_vars": "RERUN_USE_ASAN=1 RERUN_SET_CXX_VERSION=20 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp"
15+
"extra_env_vars": "RERUN_USE_ASAN=1 RERUN_SET_CXX_VERSION=20 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp",
16+
"pr_ci": false
1517
},
1618
{
17-
"name": "Windows x64",
19+
"name": "Windows x64, C++17",
1820
"runs_on": "windows-latest-8-cores",
1921
"cache_key": "build-windows",
20-
"extra_env_vars": ""
22+
"extra_env_vars": "RERUN_SET_CXX_VERSION=17",
23+
"pr_ci": true
24+
},
25+
{
26+
"name": "Windows x64, C++20",
27+
"runs_on": "windows-latest-8-cores",
28+
"cache_key": "build-windows",
29+
"extra_env_vars": "RERUN_SET_CXX_VERSION=20",
30+
"pr_ci": false
2131
},
2232
{
2333
"name": "Mac aarch64",
2434
"runs_on": "macos-15-large",
2535
"cache_key": "build-macos-arm64",
26-
"extra_env_vars": "RERUN_USE_ASAN=1 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp"
36+
"extra_env_vars": "RERUN_USE_ASAN=1 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp",
37+
"pr_ci": true
2738
}
2839
]
2940
}

.github/workflows/reusable_checks_cpp.yml

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
needs: matrix_prep
6161
strategy:
6262
matrix: ${{ fromJson(needs.matrix_prep.outputs.MATRIX) }}
63+
if: ${{ github.event_name != 'pull_request' }} || ${{ matrix.pr_ci != false }}
6364
runs-on: ${{ matrix.runs_on }}
6465
steps:
6566
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)