Skip to content

Commit fcdb9ba

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 4928b03 commit fcdb9ba

File tree

2 files changed

+33
-29
lines changed

2 files changed

+33
-29
lines changed

‎.github/workflows/ci_sh_def.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- '3.6'
4444
- '3.9'
4545
- '3.10'
46-
- '3.11-dev'
46+
- '3.11'
4747
- 'pypy-3.7'
4848
- 'pypy-3.8'
4949
- 'pypy-3.9'
@@ -115,10 +115,12 @@ jobs:
115115
run: python -m pip install pytest-github-actions-annotate-failures
116116

117117
# First build - C++11 mode and inplace
118+
# More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON here.
118119
- name: Configure C++11 ${{ matrix.args }}
119120
run: >
120121
cmake -S . -B .
121122
-DPYBIND11_WERROR=ON
123+
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON
122124
-DDOWNLOAD_CATCH=ON
123125
-DDOWNLOAD_EIGEN=ON
124126
-DCMAKE_CXX_STANDARD=11
@@ -133,7 +135,7 @@ jobs:
133135

134136
- name: C++11 tests
135137
# TODO: Figure out how to load the DLL on Python 3.8+
136-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11-dev' || matrix.python == 'pypy-3.8'))"
138+
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'))"
137139
run: cmake --build . --target cpptest -j 2
138140

139141
- name: Interface test C++11
@@ -143,10 +145,12 @@ jobs:
143145
run: git clean -fdx
144146

145147
# Second build - C++17 mode and in a build directory
148+
# More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF here.
146149
- name: Configure C++17
147150
run: >
148151
cmake -S . -B build2
149152
-DPYBIND11_WERROR=ON
153+
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
150154
-DDOWNLOAD_CATCH=ON
151155
-DDOWNLOAD_EIGEN=ON
152156
-DCMAKE_CXX_STANDARD=17
@@ -161,7 +165,7 @@ jobs:
161165

162166
- name: C++ tests
163167
# TODO: Figure out how to load the DLL on Python 3.8+
164-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11-dev' || matrix.python == 'pypy-3.8'))"
168+
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'))"
165169
run: cmake --build build2 --target cpptest
166170

167171
# Third build - C++17 mode with unstable ABI
@@ -202,7 +206,7 @@ jobs:
202206
- python-version: "3.9"
203207
python-debug: true
204208
valgrind: true
205-
- python-version: "3.11-dev"
209+
- python-version: "3.11"
206210
python-debug: false
207211

208212
name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64"
@@ -410,7 +414,7 @@ jobs:
410414
# Testing on CentOS 7 + PGI compilers, which seems to require more workarounds
411415
centos-nvhpc7:
412416
runs-on: ubuntu-latest
413-
name: "🐍 3 • CentOS7 / PGI 22.3 • x64"
417+
name: "🐍 3 • CentOS7 / PGI 22.9 • x64"
414418
container: centos:7
415419

416420
steps:
@@ -420,7 +424,7 @@ jobs:
420424
run: yum update -y && yum install -y epel-release && yum install -y git python3-devel make environment-modules cmake3 yum-utils
421425

422426
- name: Install NVidia HPC SDK
423-
run: yum-config-manager --add-repo https://developer.download.nvidia.com/hpc-sdk/rhel/nvhpc.repo && yum -y install nvhpc-22.3
427+
run: yum-config-manager --add-repo https://developer.download.nvidia.com/hpc-sdk/rhel/nvhpc.repo && yum -y install nvhpc-22.9
424428

425429
# On CentOS 7, we have to filter a few tests (compiler internal error)
426430
# and allow deeper template recursion (not needed on CentOS 8 with a newer
@@ -430,12 +434,12 @@ jobs:
430434
shell: bash
431435
run: |
432436
source /etc/profile.d/modules.sh
433-
module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/22.3
437+
module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/22.9
434438
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
435439
-DCMAKE_CXX_STANDARD=11 \
436440
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
437441
-DCMAKE_CXX_FLAGS="-Wc,--pending_instantiations=0 -DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
438-
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
442+
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp"
439443
440444
# Building before installing Pip should produce a warning but not an error
441445
- name: Build

‎.github/workflows/ci_sh_def.yml.patch

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2022-10-17 16:32:48.992875558 -0700
2-
+++ ci_sh_def.yml 2022-10-17 16:33:14.278737496 -0700
1+
--- ci.yml 2022-10-30 13:26:32.377345870 -0700
2+
+++ ci_sh_def.yml 2022-10-30 13:32:48.125051576 -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-
@@ -110,6 +122,7 @@
30+
@@ -112,6 +124,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-
@@ -137,6 +150,7 @@
38+
@@ -141,6 +154,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-
@@ -158,6 +172,7 @@
46+
@@ -162,6 +176,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-
@@ -245,6 +260,7 @@
54+
@@ -249,6 +264,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-
@@ -307,6 +323,7 @@
62+
@@ -311,6 +327,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-
@@ -336,7 +353,8 @@
70+
@@ -340,7 +357,8 @@
7171
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
7272

7373
- name: Configure
@@ -77,80 +77,80 @@
7777

7878
- name: Build
7979
run: cmake --build build -j2 --verbose
80-
@@ -416,7 +434,7 @@
80+
@@ -420,7 +438,7 @@
8181
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
8282
-DCMAKE_CXX_STANDARD=11 \
8383
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
8484
- -DCMAKE_CXX_FLAGS="-Wc,--pending_instantiations=0" \
8585
+ -DCMAKE_CXX_FLAGS="-Wc,--pending_instantiations=0 -DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
86-
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
86+
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp"
8787

8888
# Building before installing Pip should produce a warning but not an error
89-
@@ -475,6 +493,7 @@
89+
@@ -479,6 +497,7 @@
9090
-DPYBIND11_WERROR=ON
9191
-DDOWNLOAD_CATCH=ON
9292
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
9393
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
9494
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
9595

9696
- name: Build
97-
@@ -530,6 +549,7 @@
97+
@@ -534,6 +553,7 @@
9898
-DDOWNLOAD_CATCH=ON \
9999
-DDOWNLOAD_EIGEN=OFF \
100100
-DCMAKE_CXX_STANDARD=11 \
101101
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
102102
-DCMAKE_CXX_COMPILER=$(which icpc) \
103103
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
104104

105-
@@ -562,6 +582,7 @@
105+
@@ -566,6 +586,7 @@
106106
-DDOWNLOAD_CATCH=ON \
107107
-DDOWNLOAD_EIGEN=OFF \
108108
-DCMAKE_CXX_STANDARD=17 \
109109
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
110110
-DCMAKE_CXX_COMPILER=$(which icpc) \
111111
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
112112

113-
@@ -629,6 +650,7 @@
113+
@@ -633,6 +654,7 @@
114114
-DDOWNLOAD_CATCH=ON
115115
-DDOWNLOAD_EIGEN=ON
116116
-DCMAKE_CXX_STANDARD=11
117117
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
118118
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
119119

120120
- name: Build
121-
@@ -679,6 +701,7 @@
121+
@@ -683,6 +705,7 @@
122122
cmake ../pybind11-tests
123123
-DDOWNLOAD_CATCH=ON
124124
-DPYBIND11_WERROR=ON
125125
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
126126
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
127127
working-directory: /build-tests
128128

129-
@@ -774,6 +797,7 @@
129+
@@ -778,6 +801,7 @@
130130
-DPYBIND11_WERROR=ON
131131
-DDOWNLOAD_CATCH=ON
132132
-DDOWNLOAD_EIGEN=ON
133133
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
134134
${{ matrix.args }}
135135
- name: Build C++11
136136
run: cmake --build build -j 2
137-
@@ -828,6 +852,7 @@
137+
@@ -832,6 +856,7 @@
138138
-DPYBIND11_WERROR=ON
139139
-DDOWNLOAD_CATCH=ON
140140
-DDOWNLOAD_EIGEN=ON
141141
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
142142
${{ matrix.args }}
143143
- name: Build C++11
144144
run: cmake --build build --config Debug -j 2
145-
@@ -868,6 +893,7 @@
145+
@@ -872,6 +897,7 @@
146146
-DDOWNLOAD_CATCH=ON
147147
-DDOWNLOAD_EIGEN=ON
148148
-DCMAKE_CXX_STANDARD=20
149149
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
150150

151151
- name: Build C++20
152152
run: cmake --build build -j 2
153-
@@ -915,7 +941,7 @@
153+
@@ -919,7 +945,7 @@
154154
- name: Configure C++11
155155
# LTO leads to many undefined reference like
156156
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -159,7 +159,7 @@
159159

160160
- name: Build C++11
161161
run: cmake --build build -j 2
162-
@@ -933,7 +959,7 @@
162+
@@ -937,7 +963,7 @@
163163
run: git clean -fdx
164164

165165
- name: Configure C++14
@@ -168,7 +168,7 @@
168168

169169
- name: Build C++14
170170
run: cmake --build build2 -j 2
171-
@@ -951,7 +977,7 @@
171+
@@ -955,7 +981,7 @@
172172
run: git clean -fdx
173173

174174
- name: Configure C++17

0 commit comments

Comments
 (0)