Skip to content

Commit 10283c2

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 47422c5 commit 10283c2

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

‎.github/workflows/ci_sh_def.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ jobs:
9999
run: brew install boost
100100

101101
- name: Update CMake
102-
uses: jwlawson/actions-setup-cmake@v1.14
102+
uses: jwlawson/actions-setup-cmake@v2.0
103103

104104
- name: Cache wheels
105105
if: runner.os == 'macOS'
106-
uses: actions/cache@v3
106+
uses: actions/cache@v4
107107
with:
108108
# This path is specific to macOS - we really only need it for PyPy NumPy wheels
109109
# See https://github.com/actions/cache/blob/master/examples.md#python---pip
@@ -230,11 +230,11 @@ jobs:
230230
debug: ${{ matrix.python-debug }}
231231

232232
- name: Update CMake
233-
uses: jwlawson/actions-setup-cmake@v1.14
233+
uses: jwlawson/actions-setup-cmake@v2.0
234234

235235
- name: Valgrind cache
236236
if: matrix.valgrind
237-
uses: actions/cache@v3
237+
uses: actions/cache@v4
238238
id: cache-valgrind
239239
with:
240240
path: valgrind
@@ -502,7 +502,7 @@ jobs:
502502
run: python3 -m pip install --upgrade pip
503503

504504
- name: Update CMake
505-
uses: jwlawson/actions-setup-cmake@v1.14
505+
uses: jwlawson/actions-setup-cmake@v2.0
506506

507507
- name: Configure
508508
shell: bash
@@ -549,8 +549,6 @@ jobs:
549549
# Testing on ICC using the oneAPI apt repo
550550
icc:
551551
runs-on: ubuntu-20.04
552-
strategy:
553-
fail-fast: false
554552

555553
name: "🐍 3 • ICC latest • x64"
556554

@@ -821,7 +819,7 @@ jobs:
821819
architecture: x86
822820

823821
- name: Update CMake
824-
uses: jwlawson/actions-setup-cmake@v1.14
822+
uses: jwlawson/actions-setup-cmake@v2.0
825823

826824
- name: Prepare MSVC
827825
uses: ilammy/[email protected]
@@ -875,7 +873,7 @@ jobs:
875873
architecture: x86
876874

877875
- name: Update CMake
878-
uses: jwlawson/actions-setup-cmake@v1.14
876+
uses: jwlawson/actions-setup-cmake@v2.0
879877

880878
- name: Prepare MSVC
881879
uses: ilammy/[email protected]
@@ -927,7 +925,7 @@ jobs:
927925
python3 -m pip install -r tests/requirements.txt
928926
929927
- name: Update CMake
930-
uses: jwlawson/actions-setup-cmake@v1.14
928+
uses: jwlawson/actions-setup-cmake@v2.0
931929

932930
- name: Configure C++20
933931
run: >
@@ -1096,7 +1094,7 @@ jobs:
10961094
python-version: ${{ matrix.python }}
10971095

10981096
- name: Update CMake
1099-
uses: jwlawson/actions-setup-cmake@v1.14
1097+
uses: jwlawson/actions-setup-cmake@v2.0
11001098

11011099
- name: Install ninja-build tool
11021100
uses: seanmiddleditch/gha-setup-ninja@v4
@@ -1167,7 +1165,7 @@ jobs:
11671165
run: clang++ --version
11681166

11691167
- name: Update CMake
1170-
uses: jwlawson/actions-setup-cmake@v1.14
1168+
uses: jwlawson/actions-setup-cmake@v2.0
11711169

11721170
- name: Run pip installs
11731171
run: |

‎.github/workflows/ci_sh_def.yml.patch

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2024-01-16 21:10:28.100295655 -0800
2-
+++ ci_sh_def.yml 2024-01-16 21:10:56.792251785 -0800
1+
--- ci.yml 2024-02-20 12:29:08.800226093 -0800
2+
+++ ci_sh_def.yml 2024-02-20 12:29:39.408187912 -0800
33
@@ -1,4 +1,16 @@
44
-name: CI
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -101,111 +101,111 @@
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-
@@ -567,6 +586,7 @@
104+
@@ -565,6 +584,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-
@@ -599,6 +619,7 @@
112+
@@ -597,6 +617,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-
@@ -672,6 +693,7 @@
120+
@@ -670,6 +691,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-
@@ -722,6 +744,7 @@
128+
@@ -720,6 +742,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-
@@ -817,6 +840,7 @@
136+
@@ -815,6 +838,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-
@@ -871,6 +895,7 @@
144+
@@ -869,6 +893,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-
@@ -911,6 +936,7 @@
152+
@@ -909,6 +934,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-
@@ -931,6 +957,7 @@
160+
@@ -929,6 +955,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-
@@ -983,6 +1010,7 @@
168+
@@ -981,6 +1008,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-
@@ -1004,6 +1032,7 @@
176+
@@ -1002,6 +1030,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-
@@ -1025,6 +1054,7 @@
184+
@@ -1023,6 +1052,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-
@@ -1092,6 +1122,7 @@
192+
@@ -1090,6 +1120,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-
@@ -1157,6 +1188,7 @@
200+
@@ -1155,6 +1186,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-
@@ -1180,6 +1212,7 @@
208+
@@ -1178,6 +1210,7 @@
209209
-DDOWNLOAD_EIGEN=ON
210210
-DCMAKE_CXX_COMPILER=clang++
211211
-DCMAKE_CXX_STANDARD=17

0 commit comments

Comments
 (0)