Skip to content

Commit 1bc563e

Browse files
committed
ci: test C++17 on MSVC 2017
1 parent b3d8fec commit 1bc563e

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,20 @@ jobs:
2929
python: 3.6
3030
arch: x64
3131
max-cxx-std: 17
32-
args: "-DPYBIND11_FINDPYTHON=ON"
33-
- runs-on: macos-latest
34-
python: 3.7
35-
arch: x64
36-
max-cxx-std: 17
37-
args: "-DPYBIND11_FINDPYTHON=ON"
32+
args: >
33+
-DPYBIND11_FINDPYTHON=ON
3834
- runs-on: windows-2016
3935
python: 3.7
4036
arch: x86
41-
max-cxx-std: 14
37+
max-cxx-std: 17
38+
args2: >
39+
-DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR"
4240
- runs-on: windows-latest
4341
python: 3.6
4442
arch: x64
4543
max-cxx-std: 17
46-
args: "-DPYBIND11_FINDPYTHON=ON"
44+
args: >
45+
-DPYBIND11_FINDPYTHON=ON
4746
- runs-on: windows-latest
4847
python: 3.7
4948
arch: x64
@@ -57,6 +56,8 @@ jobs:
5756
python: 3.9-dev
5857
arch: x64
5958
max-cxx-std: 17
59+
args: >
60+
-DPYBIND11_FINDPYTHON=ON
6061
6162
exclude:
6263
# Currently 32bit only, and we build 64bit
@@ -92,8 +93,7 @@ jobs:
9293
python-version: ${{ matrix.python }}
9394
architecture: ${{ matrix.arch }}
9495

95-
- name: Setup Boost
96-
if: runner.os != 'macOS'
96+
- name: Setup Boost (Windows / Linux latest)
9797
run: echo "::set-env name=BOOST_ROOT::$BOOST_ROOT_1_72_0"
9898

9999
- name: Update CMake
@@ -114,7 +114,6 @@ jobs:
114114
run: python -m pip install -r tests/requirements.txt --prefer-binary
115115

116116
- name: Configure C++11 ${{ matrix.args }}
117-
shell: bash
118117
run: >
119118
cmake -S . -B .
120119
-DPYBIND11_WERROR=ON
@@ -139,14 +138,14 @@ jobs:
139138
run: git clean -fdx
140139

141140
- name: Configure C++${{ matrix.max-cxx-std }} ${{ matrix.args }}
142-
shell: bash
143141
run: >
144142
cmake -S . -B build2
145143
-DPYBIND11_WERROR=ON
146144
-DDOWNLOAD_CATCH=ON
147145
-DDOWNLOAD_EIGEN=ON
148146
-DCMAKE_CXX_STANDARD=${{ matrix.max-cxx-std }}
149147
${{ matrix.args }}
148+
${{ matrix.args2 }}
150149
151150
- name: Build C++${{ matrix.max-cxx-std }}
152151
run: cmake --build build2 -j 2

0 commit comments

Comments
 (0)