Skip to content

Commit feed8b1

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 0103ed1 commit feed8b1

File tree

2 files changed

+61
-53
lines changed

2 files changed

+61
-53
lines changed

‎.github/workflows/ci_sh_def.yml‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,9 @@ jobs:
8585
- uses: actions/checkout@v4
8686

8787
- name: Setup Python ${{ matrix.python }}
88-
uses: actions/setup-python@v4
88+
uses: actions/setup-python@v5
8989
with:
9090
python-version: ${{ matrix.python }}
91-
allow-prereleases: true
9291

9392
- name: Setup Boost (Linux)
9493
# Can't use boost + define _
@@ -763,7 +762,7 @@ jobs:
763762
steps:
764763
- uses: actions/checkout@v4
765764

766-
- uses: actions/setup-python@v4
765+
- uses: actions/setup-python@v5
767766
with:
768767
python-version: "3.x"
769768

@@ -816,7 +815,7 @@ jobs:
816815
- uses: actions/checkout@v4
817816

818817
- name: Setup Python ${{ matrix.python }}
819-
uses: actions/setup-python@v4
818+
uses: actions/setup-python@v5
820819
with:
821820
python-version: ${{ matrix.python }}
822821
architecture: x86
@@ -870,7 +869,7 @@ jobs:
870869
- uses: actions/checkout@v4
871870

872871
- name: Setup Python ${{ matrix.python }}
873-
uses: actions/setup-python@v4
872+
uses: actions/setup-python@v5
874873
with:
875874
python-version: ${{ matrix.python }}
876875
architecture: x86
@@ -919,7 +918,7 @@ jobs:
919918
- uses: actions/checkout@v4
920919

921920
- name: Setup Python ${{ matrix.python }}
922-
uses: actions/setup-python@v4
921+
uses: actions/setup-python@v5
923922
with:
924923
python-version: ${{ matrix.python }}
925924

@@ -1001,7 +1000,11 @@ jobs:
10011000
- name: Configure C++11
10021001
# LTO leads to many undefined reference like
10031002
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
1004-
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" -S . -B build
1003+
run: >-
1004+
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
1005+
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
1006+
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
1007+
-S . -B build
10051008
10061009
- name: Build C++11
10071010
run: cmake --build build -j 2
@@ -1019,7 +1022,11 @@ jobs:
10191022
run: git clean -fdx
10201023

10211024
- name: Configure C++14
1022-
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" -S . -B build2
1025+
run: >-
1026+
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
1027+
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
1028+
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
1029+
-S . -B build2
10231030
10241031
- name: Build C++14
10251032
run: cmake --build build2 -j 2
@@ -1037,7 +1044,11 @@ jobs:
10371044
run: git clean -fdx
10381045

10391046
- name: Configure C++17
1040-
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" -S . -B build3
1047+
run: >-
1048+
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
1049+
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
1050+
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
1051+
-S . -B build3
10411052
10421053
- name: Build C++17
10431054
run: cmake --build build3 -j 2
@@ -1073,7 +1084,7 @@ jobs:
10731084
uses: egor-tensin/setup-clang@v1
10741085

10751086
- name: Setup Python ${{ matrix.python }}
1076-
uses: actions/setup-python@v4
1087+
uses: actions/setup-python@v5
10771088
with:
10781089
python-version: ${{ matrix.python }}
10791090

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

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2023-12-01 21:59:50.570956290 -0800
2-
+++ ci_sh_def.yml 2023-12-01 22:00:43.098860727 -0800
1+
--- ci.yml 2023-12-14 23:14:57.621249678 -0800
2+
+++ ci_sh_def.yml 2023-12-14 23:58:28.144667703 -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-
@@ -119,6 +131,7 @@
30+
@@ -118,6 +130,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-
@@ -148,6 +161,7 @@
38+
@@ -147,6 +160,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-
@@ -169,6 +183,7 @@
46+
@@ -168,6 +182,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-
@@ -256,6 +271,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-
@@ -324,6 +340,7 @@
62+
@@ -323,6 +339,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-
@@ -353,7 +370,7 @@
70+
@@ -352,7 +369,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-
@@ -441,7 +458,7 @@
79+
@@ -440,7 +457,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,130 +85,127 @@
8585
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp"
8686

8787
- name: Build
88-
@@ -495,6 +512,7 @@
88+
@@ -494,6 +511,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-
@@ -517,6 +535,7 @@
96+
@@ -516,6 +534,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-
@@ -568,6 +587,7 @@
104+
@@ -567,6 +586,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-
@@ -600,6 +620,7 @@
112+
@@ -599,6 +619,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-
@@ -673,6 +694,7 @@
120+
@@ -672,6 +693,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-
@@ -723,6 +745,7 @@
128+
@@ -722,6 +744,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-
@@ -818,6 +841,7 @@
136+
@@ -817,6 +840,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-
@@ -872,6 +896,7 @@
144+
@@ -871,6 +895,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-
@@ -912,6 +937,7 @@
152+
@@ -911,6 +936,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-
@@ -932,6 +958,7 @@
160+
@@ -931,6 +957,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-
@@ -974,7 +1001,7 @@
169-
- name: Configure C++11
170-
# LTO leads to many undefined reference like
171-
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
172-
- run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build
173-
+ run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" -S . -B build
168+
@@ -976,6 +1003,7 @@
169+
run: >-
170+
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
171+
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
172+
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
173+
-S . -B build
174174

175175
- name: Build C++11
176-
run: cmake --build build -j 2
177-
@@ -992,7 +1019,7 @@
178-
run: git clean -fdx
179-
180-
- name: Configure C++14
181-
- run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build2
182-
+ run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" -S . -B build2
176+
@@ -997,6 +1025,7 @@
177+
run: >-
178+
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
179+
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
180+
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
181+
-S . -B build2
183182

184183
- name: Build C++14
185-
run: cmake --build build2 -j 2
186-
@@ -1010,7 +1037,7 @@
187-
run: git clean -fdx
188-
189-
- name: Configure C++17
190-
- run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build3
191-
+ run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" -S . -B build3
184+
@@ -1018,6 +1047,7 @@
185+
run: >-
186+
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
187+
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
188+
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
189+
-S . -B build3
192190

193191
- name: Build C++17
194-
run: cmake --build build3 -j 2
195-
@@ -1077,6 +1104,7 @@
192+
@@ -1085,6 +1115,7 @@
196193
-DDOWNLOAD_EIGEN=ON
197194
-DCMAKE_CXX_COMPILER=clang++
198195
-DCMAKE_CXX_STANDARD=17
199196
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
200197

201198
- name: Build
202199
run: cmake --build . -j 2
203-
@@ -1142,6 +1170,7 @@
200+
@@ -1150,6 +1181,7 @@
204201
-DDOWNLOAD_EIGEN=ON
205202
-DCMAKE_CXX_COMPILER=clang++
206203
-DCMAKE_CXX_STANDARD=17
207204
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
208205
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
209206

210207
- name: Build
211-
@@ -1165,6 +1194,7 @@
208+
@@ -1173,6 +1205,7 @@
212209
-DDOWNLOAD_EIGEN=ON
213210
-DCMAKE_CXX_COMPILER=clang++
214211
-DCMAKE_CXX_STANDARD=17

0 commit comments

Comments
 (0)