Skip to content

Commit ddb677b

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 3a5d27e commit ddb677b

File tree

2 files changed

+35
-33
lines changed

2 files changed

+35
-33
lines changed

‎.github/workflows/ci_sh_def.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
- '3.9'
5050
- '3.10'
5151
- '3.11'
52+
- '3.12'
5253
- 'pypy-3.7'
5354
- 'pypy-3.8'
5455
- 'pypy-3.9'
@@ -87,6 +88,7 @@ jobs:
8788
uses: actions/setup-python@v4
8889
with:
8990
python-version: ${{ matrix.python }}
91+
allow-prereleases: true
9092

9193
- name: Setup Boost (Linux)
9294
# Can't use boost + define _
@@ -474,16 +476,16 @@ jobs:
474476
fail-fast: false
475477
matrix:
476478
include:
477-
- { gcc: 7, std: 11, container_suffix: "" }
478-
- { gcc: 7, std: 17, container_suffix: "" }
479-
- { gcc: 8, std: 14, container_suffix: "" }
480-
- { gcc: 8, std: 17, container_suffix: "" }
481-
- { gcc: 10, std: 17, container_suffix: "-bullseye" }
482-
- { gcc: 11, std: 20, container_suffix: "" }
483-
- { gcc: 12, std: 20, container_suffix: "" }
479+
- { gcc: 7, std: 11 }
480+
- { gcc: 7, std: 17 }
481+
- { gcc: 8, std: 14 }
482+
- { gcc: 8, std: 17 }
483+
- { gcc: 10, std: 17 }
484+
- { gcc: 11, std: 20 }
485+
- { gcc: 12, std: 20 }
484486

485487
name: "🐍 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64"
486-
container: "gcc:${{ matrix.gcc }}${{ matrix.container_suffix }}"
488+
container: "gcc:${{ matrix.gcc }}"
487489

488490
steps:
489491
- uses: actions/checkout@v3

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2023-06-17 07:10:16.997113344 -0700
2-
+++ ci_sh_def.yml 2023-06-17 07:15:45.148706667 -0700
1+
--- ci.yml 2023-06-27 15:11:06.976142533 -0700
2+
+++ ci_sh_def.yml 2023-06-27 15:11:46.760090228 -0700
33
@@ -1,4 +1,16 @@
44
-name: CI
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -27,47 +27,47 @@
2727
cancel-in-progress: true
2828

2929
env:
30-
@@ -117,6 +129,7 @@
30+
@@ -119,6 +131,7 @@
3131
-DDOWNLOAD_CATCH=ON
3232
-DDOWNLOAD_EIGEN=ON
3333
-DCMAKE_CXX_STANDARD=11
3434
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
3535
${{ matrix.args }}
3636

3737
- name: Build C++11
38-
@@ -146,6 +159,7 @@
38+
@@ -148,6 +161,7 @@
3939
-DDOWNLOAD_CATCH=ON
4040
-DDOWNLOAD_EIGEN=ON
4141
-DCMAKE_CXX_STANDARD=17
4242
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
4343
${{ matrix.args }}
4444

4545
- name: Build
46-
@@ -167,6 +181,7 @@
46+
@@ -169,6 +183,7 @@
4747
-DDOWNLOAD_CATCH=ON
4848
-DDOWNLOAD_EIGEN=ON
4949
-DCMAKE_CXX_STANDARD=17
5050
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
5151
-DPYBIND11_INTERNALS_VERSION=10000000
5252
${{ matrix.args }}
5353

54-
@@ -253,6 +268,7 @@
54+
@@ -255,6 +270,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-
@@ -318,6 +334,7 @@
62+
@@ -320,6 +336,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-
@@ -347,7 +364,7 @@
70+
@@ -349,7 +366,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-
@@ -428,7 +445,7 @@
79+
@@ -430,7 +447,7 @@
8080
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
8181
-DCMAKE_CXX_STANDARD=11 \
8282
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -85,87 +85,87 @@
8585
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp"
8686

8787
# Building before installing Pip should produce a warning but not an error
88-
@@ -487,6 +504,7 @@
88+
@@ -489,6 +506,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-
@@ -509,6 +527,7 @@
96+
@@ -511,6 +529,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-
@@ -560,6 +579,7 @@
104+
@@ -562,6 +581,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-
@@ -592,6 +612,7 @@
112+
@@ -594,6 +614,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-
@@ -659,6 +680,7 @@
120+
@@ -661,6 +682,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-
@@ -709,6 +731,7 @@
128+
@@ -711,6 +733,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-
@@ -804,6 +827,7 @@
136+
@@ -806,6 +829,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-
@@ -858,6 +882,7 @@
144+
@@ -860,6 +884,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-
@@ -898,6 +923,7 @@
152+
@@ -900,6 +925,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-
@@ -918,6 +944,7 @@
160+
@@ -920,6 +946,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-
@@ -960,7 +987,7 @@
168+
@@ -962,7 +989,7 @@
169169
- name: Configure C++11
170170
# LTO leads to many undefined reference like
171171
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -174,7 +174,7 @@
174174

175175
- name: Build C++11
176176
run: cmake --build build -j 2
177-
@@ -978,7 +1005,7 @@
177+
@@ -980,7 +1007,7 @@
178178
run: git clean -fdx
179179

180180
- name: Configure C++14
@@ -183,7 +183,7 @@
183183

184184
- name: Build C++14
185185
run: cmake --build build2 -j 2
186-
@@ -996,7 +1023,7 @@
186+
@@ -998,7 +1025,7 @@
187187
run: git clean -fdx
188188

189189
- name: Configure C++17
@@ -192,23 +192,23 @@
192192

193193
- name: Build C++17
194194
run: cmake --build build3 -j 2
195-
@@ -1063,6 +1090,7 @@
195+
@@ -1065,6 +1092,7 @@
196196
-DDOWNLOAD_EIGEN=ON
197197
-DCMAKE_CXX_COMPILER=clang++
198198
-DCMAKE_CXX_STANDARD=17
199199
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
200200

201201
- name: Build
202202
run: cmake --build . -j 2
203-
@@ -1128,6 +1156,7 @@
203+
@@ -1130,6 +1158,7 @@
204204
-DDOWNLOAD_EIGEN=ON
205205
-DCMAKE_CXX_COMPILER=clang++
206206
-DCMAKE_CXX_STANDARD=17
207207
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
208208
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
209209

210210
- name: Build
211-
@@ -1151,6 +1180,7 @@
211+
@@ -1153,6 +1182,7 @@
212212
-DDOWNLOAD_EIGEN=ON
213213
-DCMAKE_CXX_COMPILER=clang++
214214
-DCMAKE_CXX_STANDARD=17

0 commit comments

Comments
 (0)