Skip to content

Commit 6765d4e

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 903b92f commit 6765d4e

File tree

2 files changed

+23
-37
lines changed

2 files changed

+23
-37
lines changed

‎.github/workflows/ci_sh_def.yml

+2-16
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,6 @@ jobs:
329329
fail-fast: false
330330
matrix:
331331
clang:
332-
- 3.6
333-
- 3.7
334-
- 3.9
335-
- 7
336-
- 9
337332
- dev
338333
std:
339334
- 11
@@ -342,8 +337,6 @@ jobs:
342337
include:
343338
- clang: 5
344339
std: 14
345-
- clang: 10
346-
std: 17
347340
- clang: 11
348341
std: 20
349342
- clang: 12
@@ -522,10 +515,6 @@ jobs:
522515
fail-fast: false
523516
matrix:
524517
include:
525-
- { gcc: 7, std: 11 }
526-
- { gcc: 7, std: 17 }
527-
- { gcc: 8, std: 14 }
528-
- { gcc: 8, std: 17 }
529518
- { gcc: 9, std: 20 }
530519
- { gcc: 10, std: 17 }
531520
- { gcc: 10, std: 20 }
@@ -751,9 +740,9 @@ jobs:
751740

752741
# This tests an "install" with the CMake tools
753742
install-classic:
754-
name: "🐍 3.7 • Debian • x86 • Install"
743+
name: "🐍 3.9 • Debian • x86 • Install"
755744
runs-on: ubuntu-latest
756-
container: i386/debian:buster
745+
container: i386/debian:bullseye
757746

758747
steps:
759748
- uses: actions/checkout@v1 # v1 is required to run inside docker
@@ -834,7 +823,6 @@ jobs:
834823
fail-fast: false
835824
matrix:
836825
python:
837-
- '3.7'
838826
- '3.8'
839827
- '3.9'
840828
- '3.10'
@@ -852,8 +840,6 @@ jobs:
852840
args: -DCMAKE_CXX_STANDARD=20
853841
- python: '3.8'
854842
args: -DCMAKE_CXX_STANDARD=17
855-
- python: '3.7'
856-
args: -DCMAKE_CXX_STANDARD=14
857843

858844

859845
name: "🐍 ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}"

‎.github/workflows/ci_sh_def.yml.patch

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2024-07-29 11:18:11.967568957 -0700
2-
+++ ci_sh_def.yml 2024-07-29 11:18:42.087538968 -0700
1+
--- ci.yml 2024-07-30 11:20:28.997003056 -0700
2+
+++ ci_sh_def.yml 2024-07-30 11:21:39.724969167 -0700
33
@@ -1,4 +1,16 @@
44
-name: CI
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -67,15 +67,15 @@
6767

6868
- name: Build
6969
run: cmake --build build -j 2
70-
@@ -364,6 +381,7 @@
70+
@@ -357,6 +374,7 @@
7171
-DPYBIND11_WERROR=ON
7272
-DDOWNLOAD_CATCH=ON
7373
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
7474
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
7575
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
7676

7777
- name: Build
78-
@@ -393,7 +411,7 @@
78+
@@ -386,7 +404,7 @@
7979
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
8080

8181
- name: Configure
@@ -84,7 +84,7 @@
8484

8585
- name: Build
8686
run: cmake --build build -j2 --verbose
87-
@@ -481,7 +499,7 @@
87+
@@ -474,7 +492,7 @@
8888
cmake -S . -B build -DDOWNLOAD_CATCH=ON \
8989
-DCMAKE_CXX_STANDARD=17 \
9090
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -93,127 +93,127 @@
9393
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp"
9494

9595
- name: Build
96-
@@ -537,6 +555,7 @@
96+
@@ -526,6 +544,7 @@
9797
-DPYBIND11_WERROR=ON
9898
-DDOWNLOAD_CATCH=ON
9999
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
100100
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
101101
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
102102

103103
- name: Build
104-
@@ -559,6 +578,7 @@
104+
@@ -548,6 +567,7 @@
105105
-DPYBIND11_WERROR=ON
106106
-DDOWNLOAD_CATCH=ON
107107
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
108108
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
109109
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
110110
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
111111

112-
@@ -608,6 +628,7 @@
112+
@@ -597,6 +617,7 @@
113113
-DDOWNLOAD_CATCH=ON \
114114
-DDOWNLOAD_EIGEN=OFF \
115115
-DCMAKE_CXX_STANDARD=11 \
116116
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
117117
-DCMAKE_CXX_COMPILER=$(which icpc) \
118118
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
119119

120-
@@ -640,6 +661,7 @@
120+
@@ -629,6 +650,7 @@
121121
-DDOWNLOAD_CATCH=ON \
122122
-DDOWNLOAD_EIGEN=OFF \
123123
-DCMAKE_CXX_STANDARD=17 \
124124
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
125125
-DCMAKE_CXX_COMPILER=$(which icpc) \
126126
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
127127

128-
@@ -711,6 +733,7 @@
128+
@@ -700,6 +722,7 @@
129129
-DDOWNLOAD_CATCH=ON
130130
-DDOWNLOAD_EIGEN=ON
131131
-DCMAKE_CXX_STANDARD=11
132132
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
133133
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
134134

135135
- name: Build
136-
@@ -761,6 +784,7 @@
136+
@@ -750,6 +773,7 @@
137137
cmake ../pybind11-tests
138138
-DDOWNLOAD_CATCH=ON
139139
-DPYBIND11_WERROR=ON
140140
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
141141
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
142142
working-directory: /build-tests
143143

144-
@@ -864,6 +888,7 @@
144+
@@ -850,6 +874,7 @@
145145
-DPYBIND11_WERROR=ON
146146
-DDOWNLOAD_CATCH=ON
147147
-DDOWNLOAD_EIGEN=ON
148148
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
149149
${{ matrix.args }}
150150
- name: Build C++11
151151
run: cmake --build build -j 2
152-
@@ -918,6 +943,7 @@
152+
@@ -904,6 +929,7 @@
153153
-DPYBIND11_WERROR=ON
154154
-DDOWNLOAD_CATCH=ON
155155
-DDOWNLOAD_EIGEN=ON
156156
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
157157
${{ matrix.args }}
158158
- name: Build C++11
159159
run: cmake --build build --config Debug -j 2
160-
@@ -960,6 +986,7 @@
160+
@@ -946,6 +972,7 @@
161161
-DDOWNLOAD_CATCH=ON
162162
-DDOWNLOAD_EIGEN=ON
163163
-DCMAKE_CXX_STANDARD=20
164164
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
165165

166166
- name: Build C++20
167167
run: cmake --build build -j 2
168-
@@ -980,6 +1007,7 @@
168+
@@ -966,6 +993,7 @@
169169
-DDOWNLOAD_CATCH=ON
170170
-DDOWNLOAD_EIGEN=ON
171171
-DCMAKE_CXX_STANDARD=20
172172
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
173173
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
174174

175175
- name: Build C++20 - Exercise cmake -DPYBIND11_TEST_OVERRIDE
176-
@@ -1032,6 +1060,7 @@
176+
@@ -1018,6 +1046,7 @@
177177
run: >-
178178
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
179179
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
180180
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
181181
-S . -B build
182182

183183
- name: Build C++11
184-
@@ -1053,6 +1082,7 @@
184+
@@ -1039,6 +1068,7 @@
185185
run: >-
186186
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
187187
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
188188
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
189189
-S . -B build2
190190

191191
- name: Build C++14
192-
@@ -1074,6 +1104,7 @@
192+
@@ -1060,6 +1090,7 @@
193193
run: >-
194194
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
195195
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
196196
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
197197
-S . -B build3
198198

199199
- name: Build C++17
200-
@@ -1141,6 +1172,7 @@
200+
@@ -1127,6 +1158,7 @@
201201
-DDOWNLOAD_EIGEN=ON
202202
-DCMAKE_CXX_COMPILER=clang++
203203
-DCMAKE_CXX_STANDARD=17
204204
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
205205

206206
- name: Build
207207
run: cmake --build . -j 2
208-
@@ -1206,6 +1238,7 @@
208+
@@ -1192,6 +1224,7 @@
209209
-DDOWNLOAD_EIGEN=ON
210210
-DCMAKE_CXX_COMPILER=clang++
211211
-DCMAKE_CXX_STANDARD=17
212212
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
213213
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
214214

215215
- name: Build
216-
@@ -1229,6 +1262,7 @@
216+
@@ -1215,6 +1248,7 @@
217217
-DDOWNLOAD_EIGEN=ON
218218
-DCMAKE_CXX_COMPILER=clang++
219219
-DCMAKE_CXX_STANDARD=17

0 commit comments

Comments
 (0)