Skip to content

Commit e5b886c

Browse files
committed
ci: test C++17 on MSVC 2017
1 parent 56df3c4 commit e5b886c

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,12 @@ jobs:
3030
arch: x64
3131
max-cxx-std: 17
3232
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"
3833
- runs-on: windows-2016
3934
python: 3.7
4035
arch: x86
41-
max-cxx-std: 14
36+
max-cxx-std: 17
37+
args2: >
38+
-DCMAKE_CXX_FLAGS=/permissive-
4239
- runs-on: windows-latest
4340
python: 3.6
4441
arch: x64
@@ -57,6 +54,7 @@ jobs:
5754
python: 3.9-dev
5855
arch: x64
5956
max-cxx-std: 17
57+
args: "-DPYBIND11_FINDPYTHON=ON"
6058

6159
exclude:
6260
# Currently 32bit only, and we build 64bit
@@ -92,8 +90,7 @@ jobs:
9290
python-version: ${{ matrix.python }}
9391
architecture: ${{ matrix.arch }}
9492

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

9996
- name: Update CMake
@@ -114,7 +111,6 @@ jobs:
114111
run: python -m pip install -r tests/requirements.txt --prefer-binary
115112

116113
- name: Configure C++11 ${{ matrix.args }}
117-
shell: bash
118114
run: >
119115
cmake -S . -B .
120116
-DPYBIND11_WERROR=ON
@@ -139,14 +135,14 @@ jobs:
139135
run: git clean -fdx
140136

141137
- name: Configure C++${{ matrix.max-cxx-std }} ${{ matrix.args }}
142-
shell: bash
143138
run: >
144139
cmake -S . -B build2
145140
-DPYBIND11_WERROR=ON
146141
-DDOWNLOAD_CATCH=ON
147142
-DDOWNLOAD_EIGEN=ON
148143
-DCMAKE_CXX_STANDARD=${{ matrix.max-cxx-std }}
149144
${{ matrix.args }}
145+
${{ matrix.args2 }}
150146
151147
- name: Build C++${{ matrix.max-cxx-std }}
152148
run: cmake --build build2 -j 2

0 commit comments

Comments
 (0)