Skip to content

Commit bb68819

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 550d4b7 commit bb68819

File tree

2 files changed

+22
-28
lines changed

2 files changed

+22
-28
lines changed

‎.github/workflows/ci_sh_def.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@ jobs:
9696

9797
- name: Update CMake
9898
uses: jwlawson/[email protected]
99-
# TEMPORARILY pin version because 3.26.0-rc1 is failing under macOS:
100-
with:
101-
cmake-version: '3.25.2'
10299

103100
- name: Cache wheels
104101
if: runner.os == 'macOS'
@@ -1101,9 +1098,6 @@ jobs:
11011098

11021099
- name: Update CMake
11031100
uses: jwlawson/[email protected]
1104-
# TEMPORARILY pin version because 3.26.0-rc1 is failing under macOS:
1105-
with:
1106-
cmake-version: '3.25.2'
11071101

11081102
- name: Run pip installs
11091103
run: |

‎.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 2023-02-07 23:54:04.279545875 -0800
2-
+++ ci_sh_def.yml 2023-02-07 23:54:24.677604204 -0800
1+
--- ci.yml 2023-02-16 15:01:55.421851299 -0800
2+
+++ ci_sh_def.yml 2023-02-16 15:03:24.958936294 -0800
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+
@@ -114,6 +126,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+
@@ -143,6 +156,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+
@@ -164,6 +178,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
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
5353
${{ matrix.args }}
54-
@@ -254,6 +269,7 @@
54+
@@ -251,6 +266,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-
@@ -319,6 +335,7 @@
62+
@@ -316,6 +332,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-
@@ -348,7 +365,7 @@
70+
@@ -345,7 +362,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+
@@ -425,7 +442,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,71 +85,71 @@
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+
@@ -484,6 +501,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-
@@ -542,6 +560,7 @@
96+
@@ -539,6 +557,7 @@
9797
-DDOWNLOAD_CATCH=ON \
9898
-DDOWNLOAD_EIGEN=OFF \
9999
-DCMAKE_CXX_STANDARD=11 \
100100
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
101101
-DCMAKE_CXX_COMPILER=$(which icpc) \
102102
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
103103

104-
@@ -574,6 +593,7 @@
104+
@@ -571,6 +590,7 @@
105105
-DDOWNLOAD_CATCH=ON \
106106
-DDOWNLOAD_EIGEN=OFF \
107107
-DCMAKE_CXX_STANDARD=17 \
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-
@@ -641,6 +661,7 @@
112+
@@ -638,6 +658,7 @@
113113
-DDOWNLOAD_CATCH=ON
114114
-DDOWNLOAD_EIGEN=ON
115115
-DCMAKE_CXX_STANDARD=11
116116
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
117117
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
118118

119119
- name: Build
120-
@@ -691,6 +712,7 @@
120+
@@ -688,6 +709,7 @@
121121
cmake ../pybind11-tests
122122
-DDOWNLOAD_CATCH=ON
123123
-DPYBIND11_WERROR=ON
124124
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
125125
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
126126
working-directory: /build-tests
127127

128-
@@ -786,6 +808,7 @@
128+
@@ -783,6 +805,7 @@
129129
-DPYBIND11_WERROR=ON
130130
-DDOWNLOAD_CATCH=ON
131131
-DDOWNLOAD_EIGEN=ON
132132
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
133133
${{ matrix.args }}
134134
- name: Build C++11
135135
run: cmake --build build -j 2
136-
@@ -840,6 +863,7 @@
136+
@@ -837,6 +860,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 --config Debug -j 2
144-
@@ -880,6 +904,7 @@
144+
@@ -877,6 +901,7 @@
145145
-DDOWNLOAD_CATCH=ON
146146
-DDOWNLOAD_EIGEN=ON
147147
-DCMAKE_CXX_STANDARD=20
148148
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
149149

150150
- name: Build C++20
151151
run: cmake --build build -j 2
152-
@@ -927,7 +952,7 @@
152+
@@ -924,7 +949,7 @@
153153
- name: Configure C++11
154154
# LTO leads to many undefined reference like
155155
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -158,7 +158,7 @@
158158

159159
- name: Build C++11
160160
run: cmake --build build -j 2
161-
@@ -945,7 +970,7 @@
161+
@@ -942,7 +967,7 @@
162162
run: git clean -fdx
163163

164164
- name: Configure C++14
@@ -167,7 +167,7 @@
167167

168168
- name: Build C++14
169169
run: cmake --build build2 -j 2
170-
@@ -963,7 +988,7 @@
170+
@@ -960,7 +985,7 @@
171171
run: git clean -fdx
172172

173173
- name: Configure C++17
@@ -176,15 +176,15 @@
176176

177177
- name: Build C++17
178178
run: cmake --build build3 -j 2
179-
@@ -1030,6 +1055,7 @@
179+
@@ -1027,6 +1052,7 @@
180180
-DDOWNLOAD_EIGEN=ON
181181
-DCMAKE_CXX_COMPILER=clang++
182182
-DCMAKE_CXX_STANDARD=17
183183
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
184184

185185
- name: Build
186186
run: cmake --build . -j 2
187-
@@ -1098,6 +1124,7 @@
187+
@@ -1092,6 +1118,7 @@
188188
-DDOWNLOAD_EIGEN=ON
189189
-DCMAKE_CXX_COMPILER=clang++
190190
-DCMAKE_CXX_STANDARD=17

0 commit comments

Comments
 (0)