Skip to content

Commit 10350ab

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 03d409b commit 10350ab

File tree

2 files changed

+44
-17
lines changed

2 files changed

+44
-17
lines changed

‎.github/workflows/ci_sh_def.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,25 @@ jobs:
159159
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
160160
run: cmake --build build2 --target cpptest
161161

162+
# Third build - C++17 mode with unstable ABI
163+
- name: Configure (unstable ABI)
164+
run: >
165+
cmake -S . -B build3
166+
-DPYBIND11_WERROR=ON
167+
-DDOWNLOAD_CATCH=ON
168+
-DDOWNLOAD_EIGEN=ON
169+
-DCMAKE_CXX_STANDARD=17
170+
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
171+
-DPYBIND11_INTERNALS_VERSION=10000000
172+
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
173+
${{ matrix.args }}
174+
175+
- name: Build (unstable ABI)
176+
run: cmake --build build3 -j 2
177+
178+
- name: Python tests (unstable ABI)
179+
run: cmake --build build3 --target pytest
180+
162181
- name: Interface test
163182
run: cmake --build build2 --target test_cmake_build
164183

‎.github/workflows/ci_sh_def.yml.patch‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2021-08-26 14:44:05.472874691 -0700
2-
+++ ci_sh_def.yml 2021-08-26 15:02:18.318618529 -0700
1+
--- ci.yml 2021-09-20 05:57:17.199789637 -0700
2+
+++ ci_sh_def.yml 2021-09-20 06:45:40.129525604 -0700
33
@@ -1,4 +1,16 @@
44
-name: CI-SH-AVL
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -34,23 +34,31 @@
3434
${{ matrix.args }}
3535
${{ matrix.args2 }}
3636

37-
@@ -233,6 +247,7 @@
37+
@@ -153,6 +167,7 @@
38+
-DDOWNLOAD_CATCH=ON
39+
-DDOWNLOAD_EIGEN=ON
40+
-DCMAKE_CXX_STANDARD=17
41+
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
42+
-DPYBIND11_INTERNALS_VERSION=10000000
43+
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
44+
${{ matrix.args }}
45+
@@ -251,6 +266,7 @@
3846
-DDOWNLOAD_CATCH=ON
3947
-DDOWNLOAD_EIGEN=ON
4048
-DCMAKE_CXX_STANDARD=17
4149
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
4250

4351
- name: Build
4452
run: cmake --build build -j 2
45-
@@ -287,6 +302,7 @@
53+
@@ -305,6 +321,7 @@
4654
-DPYBIND11_WERROR=ON
4755
-DDOWNLOAD_CATCH=ON
4856
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
4957
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
5058
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
5159

5260
- name: Build
53-
@@ -316,7 +332,8 @@
61+
@@ -334,7 +351,8 @@
5462
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
5563

5664
- name: Configure
@@ -60,7 +68,7 @@
6068

6169
- name: Build
6270
run: cmake --build build -j2 --verbose
63-
@@ -396,7 +413,7 @@
71+
@@ -414,7 +432,7 @@
6472
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
6573
-DCMAKE_CXX_STANDARD=11 \
6674
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -69,63 +77,63 @@
6977
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
7078

7179
# Building before installing Pip should produce a warning but not an error
72-
@@ -455,6 +472,7 @@
80+
@@ -473,6 +491,7 @@
7381
-DPYBIND11_WERROR=ON
7482
-DDOWNLOAD_CATCH=ON
7583
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
7684
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
7785
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
7886

7987
- name: Build
80-
@@ -510,6 +528,7 @@
88+
@@ -528,6 +547,7 @@
8189
-DDOWNLOAD_CATCH=ON \
8290
-DDOWNLOAD_EIGEN=OFF \
8391
-DCMAKE_CXX_STANDARD=11 \
8492
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
8593
-DCMAKE_CXX_COMPILER=$(which icpc) \
8694
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
8795

88-
@@ -542,6 +561,7 @@
96+
@@ -560,6 +580,7 @@
8997
-DDOWNLOAD_CATCH=ON \
9098
-DDOWNLOAD_EIGEN=OFF \
9199
-DCMAKE_CXX_STANDARD=17 \
92100
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
93101
-DCMAKE_CXX_COMPILER=$(which icpc) \
94102
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
95103

96-
@@ -612,6 +632,7 @@
104+
@@ -630,6 +651,7 @@
97105
-DDOWNLOAD_CATCH=ON
98106
-DDOWNLOAD_EIGEN=ON
99107
-DCMAKE_CXX_STANDARD=11
100108
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
101109
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
102110

103111
- name: Build
104-
@@ -662,6 +683,7 @@
112+
@@ -680,6 +702,7 @@
105113
cmake ../pybind11-tests
106114
-DDOWNLOAD_CATCH=ON
107115
-DPYBIND11_WERROR=ON
108116
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
109117
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
110118
working-directory: /build-tests
111119

112-
@@ -757,6 +779,7 @@
120+
@@ -775,6 +798,7 @@
113121
-DPYBIND11_WERROR=ON
114122
-DDOWNLOAD_CATCH=ON
115123
-DDOWNLOAD_EIGEN=ON
116124
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
117125
${{ matrix.args }}
118126
- name: Build C++11
119127
run: cmake --build build -j 2
120-
@@ -803,6 +826,7 @@
128+
@@ -821,6 +845,7 @@
121129
-DPYBIND11_WERROR=ON
122130
-DDOWNLOAD_CATCH=ON
123131
-DDOWNLOAD_EIGEN=ON
124132
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
125133

126134
- name: Build C++14
127135
run: cmake --build build -j 2
128-
@@ -823,12 +847,13 @@
136+
@@ -841,12 +866,13 @@
129137
- 3.7
130138
std:
131139
- 14
@@ -140,7 +148,7 @@
140148

141149
steps:
142150
- uses: actions/checkout@v2
143-
@@ -895,7 +920,7 @@
151+
@@ -913,7 +939,7 @@
144152
- name: Configure C++11
145153
# LTO leads to many undefined reference like
146154
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -149,7 +157,7 @@
149157

150158
- name: Build C++11
151159
run: cmake --build build -j 2
152-
@@ -913,7 +938,7 @@
160+
@@ -931,7 +957,7 @@
153161
run: git clean -fdx
154162

155163
- name: Configure C++14
@@ -158,7 +166,7 @@
158166

159167
- name: Build C++14
160168
run: cmake --build build2 -j 2
161-
@@ -931,7 +956,7 @@
169+
@@ -949,7 +975,7 @@
162170
run: git clean -fdx
163171

164172
- name: Configure C++17

0 commit comments

Comments
 (0)