Skip to content

Commit 67d6788

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent d958b78 commit 67d6788

File tree

2 files changed

+53
-55
lines changed

2 files changed

+53
-55
lines changed

‎.github/workflows/ci_sh_def.yml‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
matrix:
4646
runs-on: [ubuntu-20.04, windows-2022, macos-13]
4747
python:
48-
- '3.6'
48+
- '3.8'
4949
- '3.9'
5050
- '3.12'
5151
- '3.13'
@@ -61,16 +61,17 @@ jobs:
6161
include:
6262
# Just add a key
6363
- runs-on: ubuntu-20.04
64-
python: '3.6'
64+
python: '3.8'
6565
args: >
6666
-DPYBIND11_FINDPYTHON=ON
6767
-DCMAKE_CXX_FLAGS="-D_=1"
68+
exercise_D_: 1
6869
- runs-on: ubuntu-20.04
6970
python: 'pypy-3.8'
7071
args: >
7172
-DPYBIND11_FINDPYTHON=ON
7273
- runs-on: windows-2019
73-
python: '3.6'
74+
python: '3.8'
7475
args: >
7576
-DPYBIND11_FINDPYTHON=ON
7677
# Inject a couple Windows 2019 runs
@@ -95,7 +96,7 @@ jobs:
9596

9697
- name: Setup Boost (Linux)
9798
# Can't use boost + define _
98-
if: runner.os == 'Linux' && matrix.python != '3.6'
99+
if: runner.os == 'Linux' && matrix.exercise_D_ != 1
99100
run: sudo apt-get install libboost-dev
100101

101102
- name: Setup Boost (macOS)
@@ -147,9 +148,7 @@ jobs:
147148
run: cmake --build . --target pytest -j 2
148149

149150
- name: C++11 tests
150-
# TODO: Figure out how to load the DLL on Python 3.8+
151-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11' || matrix.python == 'pypy-3.8'))"
152-
run: cmake --build . --target cpptest -j 2
151+
run: cmake --build . --target cpptest -j 2
153152

154153
- name: Interface test C++11
155154
run: cmake --build . --target test_cmake_build
@@ -179,8 +178,6 @@ jobs:
179178
run: cmake --build build2 --target pytest
180179

181180
- name: C++ tests
182-
# TODO: Figure out how to load the DLL on Python 3.8+
183-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11' || matrix.python == 'pypy-3.8'))"
184181
run: cmake --build build2 --target cpptest
185182

186183
# Third build - C++17 mode with unstable ABI
@@ -682,15 +679,13 @@ jobs:
682679
cmake --build build-17 --target test_cmake_build
683680
684681
685-
# Testing on CentOS (manylinux uses a centos base, and this is an easy way
686-
# to get GCC 4.8, which is the manylinux1 compiler).
682+
# Testing on CentOS (manylinux uses a centos base).
687683
centos:
688684
runs-on: ubuntu-latest
689685
strategy:
690686
fail-fast: false
691687
matrix:
692688
container:
693-
- "centos:7" # GCC 4.8
694689
- "almalinux:8"
695690
- "almalinux:9"
696691

@@ -700,18 +695,13 @@ jobs:
700695
steps:
701696
- name: Latest actions/checkout
702697
uses: actions/checkout@v4
703-
if: matrix.container != 'centos:7'
704698

705-
- name: Pin actions/checkout as required for centos:7
706-
uses: actions/checkout@v3
707-
if: matrix.container == 'centos:7'
699+
- name: Add Python 3.8
700+
if: matrix.container == 'almalinux:8'
701+
run: dnf update -y && dnf install -y python38-devel gcc-c++ make git
708702

709-
- name: Add Python 3 (RHEL 7)
710-
if: matrix.container == 'centos:7'
711-
run: yum update -y && yum install -y python3-devel gcc-c++ make git
712-
713-
- name: Add Python 3 (RHEL 8+)
714-
if: matrix.container != 'centos:7'
703+
- name: Add Python 3 (default)
704+
if: matrix.container != 'almalinux:8'
715705
run: dnf update -y && dnf install -y python3-devel gcc-c++ make git
716706

717707
- name: Update pip
@@ -836,17 +826,25 @@ jobs:
836826
fail-fast: false
837827
matrix:
838828
python:
839-
- 3.6
840-
- 3.7
841-
- 3.8
842-
- 3.9
829+
- '3.7'
830+
- '3.8'
831+
- '3.9'
832+
- '3.10'
833+
- '3.11'
834+
- '3.12'
843835

844836
include:
845-
- python: 3.9
837+
- python: '3.12'
846838
args: -DCMAKE_CXX_STANDARD=20
847-
- python: 3.8
839+
- python: '3.11'
840+
args: -DCMAKE_CXX_STANDARD=20
841+
- python: '3.10'
842+
args: -DCMAKE_CXX_STANDARD=20
843+
- python: '3.9'
844+
args: -DCMAKE_CXX_STANDARD=20
845+
- python: '3.8'
848846
args: -DCMAKE_CXX_STANDARD=17
849-
- python: 3.7
847+
- python: '3.7'
850848
args: -DCMAKE_CXX_STANDARD=14
851849

852850

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2024-06-19 10:06:18.454361731 -0700
2-
+++ ci_sh_def.yml 2024-06-19 10:07:59.514269934 -0700
1+
--- ci.yml 2024-06-21 22:56:01.205982412 -0700
2+
+++ ci_sh_def.yml 2024-06-21 22:57:45.189902320 -0700
33
@@ -1,4 +1,16 @@
44
-name: CI
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -27,55 +27,55 @@
2727
cancel-in-progress: true
2828

2929
env:
30-
@@ -125,6 +137,7 @@
30+
@@ -126,6 +138,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-
@@ -156,6 +169,7 @@
38+
@@ -155,6 +168,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-
@@ -177,6 +191,7 @@
46+
@@ -174,6 +188,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-
@@ -220,6 +235,7 @@
54+
@@ -217,6 +232,7 @@
5555
-DDOWNLOAD_CATCH=ON
5656
-DDOWNLOAD_EIGEN=ON
5757
-DPython_ROOT_DIR=.venv
5858
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
5959

6060
- name: Build C++11
6161
run: cmake --build build -j2
62-
@@ -293,6 +309,7 @@
62+
@@ -290,6 +306,7 @@
6363
-DDOWNLOAD_CATCH=ON
6464
-DDOWNLOAD_EIGEN=ON
6565
-DCMAKE_CXX_STANDARD=17
6666
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
6767

6868
- name: Build
6969
run: cmake --build build -j 2
70-
@@ -361,6 +378,7 @@
70+
@@ -358,6 +375,7 @@
7171
-DPYBIND11_WERROR=ON
7272
-DDOWNLOAD_CATCH=ON
7373
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
7474
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
7575
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
7676

7777
- name: Build
78-
@@ -390,7 +408,7 @@
78+
@@ -387,7 +405,7 @@
7979
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
8080

8181
- name: Configure
@@ -84,7 +84,7 @@
8484

8585
- name: Build
8686
run: cmake --build build -j2 --verbose
87-
@@ -478,7 +496,7 @@
87+
@@ -475,7 +493,7 @@
8888
cmake -S . -B build -DDOWNLOAD_CATCH=ON \
8989
-DCMAKE_CXX_STANDARD=17 \
9090
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -93,127 +93,127 @@
9393
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp"
9494

9595
- name: Build
96-
@@ -532,6 +550,7 @@
96+
@@ -529,6 +547,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

103103
- name: Build
104-
@@ -554,6 +573,7 @@
104+
@@ -551,6 +570,7 @@
105105
-DPYBIND11_WERROR=ON
106106
-DDOWNLOAD_CATCH=ON
107107
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
108108
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
109109
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
110110
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
111111

112-
@@ -603,6 +623,7 @@
112+
@@ -600,6 +620,7 @@
113113
-DDOWNLOAD_CATCH=ON \
114114
-DDOWNLOAD_EIGEN=OFF \
115115
-DCMAKE_CXX_STANDARD=11 \
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-
@@ -635,6 +656,7 @@
120+
@@ -632,6 +653,7 @@
121121
-DDOWNLOAD_CATCH=ON \
122122
-DDOWNLOAD_EIGEN=OFF \
123123
-DCMAKE_CXX_STANDARD=17 \
124124
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
125125
-DCMAKE_CXX_COMPILER=$(which icpc) \
126126
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
127127

128-
@@ -713,6 +735,7 @@
128+
@@ -703,6 +725,7 @@
129129
-DDOWNLOAD_CATCH=ON
130130
-DDOWNLOAD_EIGEN=ON
131131
-DCMAKE_CXX_STANDARD=11
132132
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
133133
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
134134

135135
- name: Build
136-
@@ -763,6 +786,7 @@
136+
@@ -753,6 +776,7 @@
137137
cmake ../pybind11-tests
138138
-DDOWNLOAD_CATCH=ON
139139
-DPYBIND11_WERROR=ON
140140
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
141141
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
142142
working-directory: /build-tests
143143

144-
@@ -858,6 +882,7 @@
144+
@@ -856,6 +880,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 -j 2
152-
@@ -912,6 +937,7 @@
152+
@@ -910,6 +935,7 @@
153153
-DPYBIND11_WERROR=ON
154154
-DDOWNLOAD_CATCH=ON
155155
-DDOWNLOAD_EIGEN=ON
156156
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
157157
${{ matrix.args }}
158158
- name: Build C++11
159159
run: cmake --build build --config Debug -j 2
160-
@@ -954,6 +980,7 @@
160+
@@ -952,6 +978,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

166166
- name: Build C++20
167167
run: cmake --build build -j 2
168-
@@ -974,6 +1001,7 @@
168+
@@ -972,6 +999,7 @@
169169
-DDOWNLOAD_CATCH=ON
170170
-DDOWNLOAD_EIGEN=ON
171171
-DCMAKE_CXX_STANDARD=20
172172
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
173173
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
174174

175175
- name: Build C++20 - Exercise cmake -DPYBIND11_TEST_OVERRIDE
176-
@@ -1026,6 +1054,7 @@
176+
@@ -1024,6 +1052,7 @@
177177
run: >-
178178
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -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 build
182182

183183
- name: Build C++11
184-
@@ -1047,6 +1076,7 @@
184+
@@ -1045,6 +1074,7 @@
185185
run: >-
186186
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -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 build2
190190

191191
- name: Build C++14
192-
@@ -1068,6 +1098,7 @@
192+
@@ -1066,6 +1096,7 @@
193193
run: >-
194194
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
195195
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
196196
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
197197
-S . -B build3
198198

199199
- name: Build C++17
200-
@@ -1135,6 +1166,7 @@
200+
@@ -1133,6 +1164,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

206206
- name: Build
207207
run: cmake --build . -j 2
208-
@@ -1200,6 +1232,7 @@
208+
@@ -1198,6 +1230,7 @@
209209
-DDOWNLOAD_EIGEN=ON
210210
-DCMAKE_CXX_COMPILER=clang++
211211
-DCMAKE_CXX_STANDARD=17
212212
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
213213
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
214214

215215
- name: Build
216-
@@ -1223,6 +1256,7 @@
216+
@@ -1221,6 +1254,7 @@
217217
-DDOWNLOAD_EIGEN=ON
218218
-DCMAKE_CXX_COMPILER=clang++
219219
-DCMAKE_CXX_STANDARD=17

0 commit comments

Comments
 (0)