Skip to content

Commit 3bd2062

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 27ce64f commit 3bd2062

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

‎.github/workflows/ci_sh_def.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
- '3.6'
4444
- '3.9'
4545
- '3.10'
46+
- '3.11-dev'
4647
- 'pypy-3.7'
4748
- 'pypy-3.8'
4849
- 'pypy-3.9'
@@ -78,7 +79,7 @@ jobs:
7879
- uses: actions/checkout@v3
7980

8081
- name: Setup Python ${{ matrix.python }}
81-
uses: actions/setup-python@v3
82+
uses: actions/setup-python@v4
8283
with:
8384
python-version: ${{ matrix.python }}
8485

@@ -201,8 +202,8 @@ jobs:
201202
- python-version: "3.9"
202203
python-debug: true
203204
valgrind: true
204-
# - python-version: "3.11-dev"
205-
# python-debug: false
205+
- python-version: "3.11-dev"
206+
python-debug: false
206207

207208
name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64"
208209
runs-on: ubuntu-latest
@@ -710,7 +711,9 @@ jobs:
710711
steps:
711712
- uses: actions/checkout@v3
712713

713-
- uses: actions/setup-python@v3
714+
- uses: actions/setup-python@v4
715+
with:
716+
python-version: "3.x"
714717

715718
- name: Install Doxygen
716719
run: sudo apt-get install -y doxygen librsvg2-bin # Changed to rsvg-convert in 20.04
@@ -758,7 +761,7 @@ jobs:
758761
- uses: actions/checkout@v3
759762

760763
- name: Setup Python ${{ matrix.python }}
761-
uses: actions/setup-python@v3
764+
uses: actions/setup-python@v4
762765
with:
763766
python-version: ${{ matrix.python }}
764767
architecture: x86
@@ -812,7 +815,7 @@ jobs:
812815
- uses: actions/checkout@v3
813816

814817
- name: Setup Python ${{ matrix.python }}
815-
uses: actions/setup-python@v3
818+
uses: actions/setup-python@v4
816819
with:
817820
python-version: ${{ matrix.python }}
818821
architecture: x86
@@ -861,7 +864,7 @@ jobs:
861864
- uses: actions/checkout@v3
862865

863866
- name: Setup Python ${{ matrix.python }}
864-
uses: actions/setup-python@v3
867+
uses: actions/setup-python@v4
865868
with:
866869
python-version: ${{ matrix.python }}
867870

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2022-06-27 22:24:23.744079410 -0700
2-
+++ ci_sh_def.yml 2022-06-27 22:25:19.500125320 -0700
1+
--- ci.yml 2022-07-09 21:47:49.308397659 -0700
2+
+++ ci_sh_def.yml 2022-07-09 21:48:50.876897366 -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-
@@ -109,6 +121,7 @@
30+
@@ -110,6 +122,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-
@@ -136,6 +149,7 @@
38+
@@ -137,6 +150,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-
@@ -157,6 +171,7 @@
46+
@@ -158,6 +172,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-
@@ -244,6 +259,7 @@
54+
@@ -245,6 +260,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-
@@ -298,6 +314,7 @@
62+
@@ -299,6 +315,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-
@@ -327,7 +344,8 @@
70+
@@ -328,7 +345,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,7 +77,7 @@
7777

7878
- name: Build
7979
run: cmake --build build -j2 --verbose
80-
@@ -407,7 +425,7 @@
80+
@@ -408,7 +426,7 @@
8181
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
8282
-DCMAKE_CXX_STANDARD=11 \
8383
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -86,71 +86,71 @@
8686
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
8787

8888
# Building before installing Pip should produce a warning but not an error
89-
@@ -466,6 +484,7 @@
89+
@@ -467,6 +485,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-
@@ -521,6 +540,7 @@
97+
@@ -522,6 +541,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-
@@ -553,6 +573,7 @@
105+
@@ -554,6 +574,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-
@@ -620,6 +641,7 @@
113+
@@ -621,6 +642,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-
@@ -670,6 +692,7 @@
121+
@@ -671,6 +693,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-
@@ -760,6 +783,7 @@
129+
@@ -763,6 +786,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-
@@ -814,6 +838,7 @@
137+
@@ -817,6 +841,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-
@@ -854,6 +879,7 @@
145+
@@ -857,6 +882,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-
@@ -901,7 +927,7 @@
153+
@@ -904,7 +930,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-
@@ -919,7 +945,7 @@
162+
@@ -922,7 +948,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-
@@ -937,7 +963,7 @@
171+
@@ -940,7 +966,7 @@
172172
run: git clean -fdx
173173

174174
- name: Configure C++17

0 commit comments

Comments
 (0)