Skip to content

Commit 540c760

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 6b3b697 commit 540c760

File tree

2 files changed

+51
-22
lines changed

2 files changed

+51
-22
lines changed

‎.github/workflows/ci_sh_def.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,35 @@ jobs:
212212
pytest tests/extra_setuptools
213213
if: "!(matrix.runs-on == 'windows-2022')"
214214

215+
manylinux:
216+
name: Manylinux on 🐍 3.13t • GIL
217+
runs-on: ubuntu-latest
218+
timeout-minutes: 40
219+
container: quay.io/pypa/musllinux_1_2_x86_64:latest
220+
steps:
221+
- uses: actions/checkout@v4
222+
with:
223+
fetch-depth: 0
224+
225+
- name: Prepare venv
226+
run: python3.13t -m venv .venv
227+
228+
- name: Install Python deps
229+
run: .venv/bin/pip install -r tests/requirements.txt
230+
231+
- name: Configure C++11
232+
run: >
233+
cmake -S. -Bbuild
234+
-DPYBIND11_WERROR=ON
235+
-DDOWNLOAD_CATCH=ON
236+
-DDOWNLOAD_EIGEN=ON
237+
-DPython_ROOT_DIR=.venv
238+
239+
- name: Build C++11
240+
run: cmake --build build -j2
241+
242+
- name: Python tests C++11
243+
run: cmake --build build --target pytest -j2
215244

216245
deadsnakes:
217246
strategy:

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2024-05-26 21:14:20.025983967 -0700
2-
+++ ci_sh_def.yml 2024-05-26 21:14:44.673959335 -0700
1+
--- ci.yml 2024-06-09 23:55:50.405348417 -0700
2+
+++ ci_sh_def.yml 2024-06-09 23:56:22.061331136 -0700
33
@@ -1,4 +1,16 @@
44
-name: CI
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -51,23 +51,23 @@
5151
-DPYBIND11_INTERNALS_VERSION=10000000
5252
${{ matrix.args }}
5353

54-
@@ -264,6 +279,7 @@
54+
@@ -293,6 +308,7 @@
5555
-DDOWNLOAD_CATCH=ON
5656
-DDOWNLOAD_EIGEN=ON
5757
-DCMAKE_CXX_STANDARD=17
5858
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
5959

6060
- name: Build
6161
run: cmake --build build -j 2
62-
@@ -332,6 +348,7 @@
62+
@@ -361,6 +377,7 @@
6363
-DPYBIND11_WERROR=ON
6464
-DDOWNLOAD_CATCH=ON
6565
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
6666
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
6767
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
6868

6969
- name: Build
70-
@@ -361,7 +378,7 @@
70+
@@ -390,7 +407,7 @@
7171
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
7272

7373
- name: Configure
@@ -76,7 +76,7 @@
7676

7777
- name: Build
7878
run: cmake --build build -j2 --verbose
79-
@@ -449,7 +466,7 @@
79+
@@ -478,7 +495,7 @@
8080
cmake -S . -B build -DDOWNLOAD_CATCH=ON \
8181
-DCMAKE_CXX_STANDARD=17 \
8282
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -85,127 +85,127 @@
8585
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp"
8686

8787
- name: Build
88-
@@ -503,6 +520,7 @@
88+
@@ -532,6 +549,7 @@
8989
-DPYBIND11_WERROR=ON
9090
-DDOWNLOAD_CATCH=ON
9191
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
9292
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
9393
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
9494

9595
- name: Build
96-
@@ -525,6 +543,7 @@
96+
@@ -554,6 +572,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
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
103103

104-
@@ -574,6 +593,7 @@
104+
@@ -603,6 +622,7 @@
105105
-DDOWNLOAD_CATCH=ON \
106106
-DDOWNLOAD_EIGEN=OFF \
107107
-DCMAKE_CXX_STANDARD=11 \
108108
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
109109
-DCMAKE_CXX_COMPILER=$(which icpc) \
110110
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
111111

112-
@@ -606,6 +626,7 @@
112+
@@ -635,6 +655,7 @@
113113
-DDOWNLOAD_CATCH=ON \
114114
-DDOWNLOAD_EIGEN=OFF \
115115
-DCMAKE_CXX_STANDARD=17 \
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-
@@ -684,6 +705,7 @@
120+
@@ -713,6 +734,7 @@
121121
-DDOWNLOAD_CATCH=ON
122122
-DDOWNLOAD_EIGEN=ON
123123
-DCMAKE_CXX_STANDARD=11
124124
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
125125
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
126126

127127
- name: Build
128-
@@ -734,6 +756,7 @@
128+
@@ -763,6 +785,7 @@
129129
cmake ../pybind11-tests
130130
-DDOWNLOAD_CATCH=ON
131131
-DPYBIND11_WERROR=ON
132132
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
133133
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
134134
working-directory: /build-tests
135135

136-
@@ -829,6 +852,7 @@
136+
@@ -858,6 +881,7 @@
137137
-DPYBIND11_WERROR=ON
138138
-DDOWNLOAD_CATCH=ON
139139
-DDOWNLOAD_EIGEN=ON
140140
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
141141
${{ matrix.args }}
142142
- name: Build C++11
143143
run: cmake --build build -j 2
144-
@@ -883,6 +907,7 @@
144+
@@ -912,6 +936,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 --config Debug -j 2
152-
@@ -925,6 +950,7 @@
152+
@@ -954,6 +979,7 @@
153153
-DDOWNLOAD_CATCH=ON
154154
-DDOWNLOAD_EIGEN=ON
155155
-DCMAKE_CXX_STANDARD=20
156156
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
157157

158158
- name: Build C++20
159159
run: cmake --build build -j 2
160-
@@ -945,6 +971,7 @@
160+
@@ -974,6 +1000,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
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
166166

167167
- name: Build C++20 - Exercise cmake -DPYBIND11_TEST_OVERRIDE
168-
@@ -997,6 +1024,7 @@
168+
@@ -1026,6 +1053,7 @@
169169
run: >-
170170
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
171171
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
172172
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
173173
-S . -B build
174174

175175
- name: Build C++11
176-
@@ -1018,6 +1046,7 @@
176+
@@ -1047,6 +1075,7 @@
177177
run: >-
178178
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -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 build2
182182

183183
- name: Build C++14
184-
@@ -1039,6 +1068,7 @@
184+
@@ -1068,6 +1097,7 @@
185185
run: >-
186186
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -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 build3
190190

191191
- name: Build C++17
192-
@@ -1106,6 +1136,7 @@
192+
@@ -1135,6 +1165,7 @@
193193
-DDOWNLOAD_EIGEN=ON
194194
-DCMAKE_CXX_COMPILER=clang++
195195
-DCMAKE_CXX_STANDARD=17
196196
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
197197

198198
- name: Build
199199
run: cmake --build . -j 2
200-
@@ -1171,6 +1202,7 @@
200+
@@ -1200,6 +1231,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
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
206206

207207
- name: Build
208-
@@ -1194,6 +1226,7 @@
208+
@@ -1223,6 +1255,7 @@
209209
-DDOWNLOAD_EIGEN=ON
210210
-DCMAKE_CXX_COMPILER=clang++
211211
-DCMAKE_CXX_STANDARD=17

0 commit comments

Comments
 (0)