Skip to content

Commit 7f41bea

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent fb7452c commit 7f41bea

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

‎.github/workflows/ci_sh_def.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# patch -i ci_sh_def.yml.patch -o ci_sh_def.yml
77
# To update the patch file after making changes to ci_sh.yml:
88
# diff -u ci.yml ci_sh_def.yml > ci_sh_def.yml.patch
9+
# git commit -a -m 'Tracking ci.yml changes from master.'
910
#
1011
# Thanks a lot to @rhaschke for PR #2930!
1112

@@ -165,7 +166,7 @@ jobs:
165166
# MSVC, but for now, this action works:
166167
- name: Prepare compiler environment for Windows 🐍 2.7
167168
if: matrix.python == 2.7 && runner.os == 'Windows'
168-
uses: ilammy/msvc-dev-cmd@v1.8.1
169+
uses: ilammy/msvc-dev-cmd@v1.9.0
169170
with:
170171
arch: x64
171172

@@ -762,7 +763,7 @@ jobs:
762763
uses: jwlawson/actions-setup-cmake@v1.9
763764

764765
- name: Prepare MSVC
765-
uses: ilammy/msvc-dev-cmd@v1.8.1
766+
uses: ilammy/msvc-dev-cmd@v1.9.0
766767
with:
767768
arch: x86
768769

@@ -809,7 +810,7 @@ jobs:
809810
uses: jwlawson/actions-setup-cmake@v1.9
810811

811812
- name: Prepare MSVC
812-
uses: ilammy/msvc-dev-cmd@v1.8.1
813+
uses: ilammy/msvc-dev-cmd@v1.9.0
813814
with:
814815
toolset: 14.0
815816

‎.github/workflows/ci_sh_def.yml.patch

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ci.yml 2021-06-18 01:41:07.246849382 -0700
2-
+++ ci_sh_def.yml 2021-06-18 01:41:47.114491643 -0700
3-
@@ -1,4 +1,15 @@
1+
--- ci.yml 2021-06-19 15:52:36.772992808 -0700
2+
+++ ci_sh_def.yml 2021-06-19 15:55:28.236643785 -0700
3+
@@ -1,4 +1,16 @@
44
-name: CI-SH-AVL
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
66
+# ci.yml
@@ -10,38 +10,39 @@
1010
+# patch -i ci_sh_def.yml.patch -o ci_sh_def.yml
1111
+# To update the patch file after making changes to ci_sh.yml:
1212
+# diff -u ci.yml ci_sh_def.yml > ci_sh_def.yml.patch
13+
+# git commit -a -m 'Tracking ci.yml changes from master.'
1314
+#
1415
+# Thanks a lot to @rhaschke for PR #2930!
1516
+
1617
+name: "CI-SH-DEF"
1718

1819
on:
1920
workflow_dispatch:
20-
@@ -104,6 +115,7 @@
21+
@@ -104,6 +116,7 @@
2122
-DDOWNLOAD_CATCH=ON
2223
-DDOWNLOAD_EIGEN=ON
2324
-DCMAKE_CXX_STANDARD=11
2425
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
2526
${{ matrix.args }}
2627

2728
- name: Build C++11
28-
@@ -131,6 +143,7 @@
29+
@@ -131,6 +144,7 @@
2930
-DDOWNLOAD_CATCH=ON
3031
-DDOWNLOAD_EIGEN=ON
3132
-DCMAKE_CXX_STANDARD=17
3233
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
3334
${{ matrix.args }}
3435
${{ matrix.args2 }}
3536

36-
@@ -287,6 +300,7 @@
37+
@@ -287,6 +301,7 @@
3738
-DPYBIND11_WERROR=ON
3839
-DDOWNLOAD_CATCH=ON
3940
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
4041
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
4142
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
4243

4344
- name: Build
44-
@@ -316,7 +330,8 @@
45+
@@ -316,7 +331,8 @@
4546
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
4647

4748
- name: Configure
@@ -51,7 +52,7 @@
5152

5253
- name: Build
5354
run: cmake --build build -j2 --verbose
54-
@@ -396,7 +411,7 @@
55+
@@ -396,7 +412,7 @@
5556
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
5657
-DCMAKE_CXX_STANDARD=11 \
5758
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -60,63 +61,63 @@
6061
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
6162

6263
# Building before installing Pip should produce a warning but not an error
63-
@@ -455,6 +470,7 @@
64+
@@ -455,6 +471,7 @@
6465
-DPYBIND11_WERROR=ON
6566
-DDOWNLOAD_CATCH=ON
6667
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
6768
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
6869
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
6970

7071
- name: Build
71-
@@ -510,6 +526,7 @@
72+
@@ -510,6 +527,7 @@
7273
-DDOWNLOAD_CATCH=ON \
7374
-DDOWNLOAD_EIGEN=OFF \
7475
-DCMAKE_CXX_STANDARD=11 \
7576
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
7677
-DCMAKE_CXX_COMPILER=$(which icpc) \
7778
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
7879

79-
@@ -542,6 +559,7 @@
80+
@@ -542,6 +560,7 @@
8081
-DDOWNLOAD_CATCH=ON \
8182
-DDOWNLOAD_EIGEN=OFF \
8283
-DCMAKE_CXX_STANDARD=17 \
8384
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
8485
-DCMAKE_CXX_COMPILER=$(which icpc) \
8586
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
8687

87-
@@ -612,6 +630,7 @@
88+
@@ -612,6 +631,7 @@
8889
-DDOWNLOAD_CATCH=ON
8990
-DDOWNLOAD_EIGEN=ON
9091
-DCMAKE_CXX_STANDARD=11
9192
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
9293
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
9394

9495
- name: Build
95-
@@ -662,6 +681,7 @@
96+
@@ -662,6 +682,7 @@
9697
cmake ../pybind11-tests
9798
-DDOWNLOAD_CATCH=ON
9899
-DPYBIND11_WERROR=ON
99100
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
100101
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
101102
working-directory: /build-tests
102103

103-
@@ -757,6 +777,7 @@
104+
@@ -757,6 +778,7 @@
104105
-DPYBIND11_WERROR=ON
105106
-DDOWNLOAD_CATCH=ON
106107
-DDOWNLOAD_EIGEN=ON
107108
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
108109
${{ matrix.args }}
109110
- name: Build C++11
110111
run: cmake --build build -j 2
111-
@@ -803,6 +824,7 @@
112+
@@ -803,6 +825,7 @@
112113
-DPYBIND11_WERROR=ON
113114
-DDOWNLOAD_CATCH=ON
114115
-DDOWNLOAD_EIGEN=ON
115116
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
116117

117118
- name: Build C++14
118119
run: cmake --build build -j 2
119-
@@ -823,12 +845,13 @@
120+
@@ -823,12 +846,13 @@
120121
- 3.7
121122
std:
122123
- 14

0 commit comments

Comments
 (0)