Skip to content

Commit 3818208

Browse files
committed
Tracking ci.yml changes from master.
1 parent 67561bc commit 3818208

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

.github/workflows/ci_sh_def.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ jobs:
342342
# Testing NVCC; forces sources to behave like .cu files
343343
cuda:
344344
runs-on: ubuntu-latest
345-
name: "🐍 3.8 • CUDA 11.2 • Ubuntu 20.04"
346-
container: nvidia/cuda:11.2.2-devel-ubuntu20.04
345+
name: "🐍 3.10 • CUDA 11.7 • Ubuntu 22.04"
346+
container: nvidia/cuda:11.7.0-devel-ubuntu22.04
347347

348348
steps:
349349
- uses: actions/checkout@v3
@@ -761,6 +761,9 @@ jobs:
761761
args: -DCMAKE_CXX_STANDARD=20
762762
- python: 3.8
763763
args: -DCMAKE_CXX_STANDARD=17
764+
- python: 3.7
765+
args: -DCMAKE_CXX_STANDARD=14
766+
764767

765768
name: "🐍 ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}"
766769
runs-on: windows-2019

.github/workflows/ci_sh_def.yml.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2022-09-15 05:25:58.998556736 -0700
2-
+++ ci_sh_def.yml 2022-09-15 05:36:11.236234132 -0700
1+
--- ci.yml 2022-10-09 21:54:56.682792329 -0700
2+
+++ ci_sh_def.yml 2022-10-09 21:56:30.413425061 -0700
33
@@ -1,4 +1,16 @@
44
-name: CI
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -126,31 +126,31 @@
126126
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
127127
working-directory: /build-tests
128128

129-
@@ -771,6 +794,7 @@
129+
@@ -774,6 +797,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-
@@ -825,6 +849,7 @@
137+
@@ -828,6 +852,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-
@@ -865,6 +890,7 @@
145+
@@ -868,6 +893,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-
@@ -912,7 +938,7 @@
153+
@@ -915,7 +941,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-
@@ -930,7 +956,7 @@
162+
@@ -933,7 +959,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-
@@ -948,7 +974,7 @@
171+
@@ -951,7 +977,7 @@
172172
run: git clean -fdx
173173

174174
- name: Configure C++17

0 commit comments

Comments
 (0)