Skip to content

Commit 6e44740

Browse files
rwgkrwgk
committed
Tracking ci.yml changes from master.
1 parent 388c03b commit 6e44740

File tree

2 files changed

+37
-33
lines changed

2 files changed

+37
-33
lines changed

‎.github/workflows/ci_sh_def.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
python: '3.6'
5858
args: >
5959
-DPYBIND11_FINDPYTHON=ON
60+
-DCMAKE_CXX_FLAGS="-D_=1"
6061
- runs-on: windows-latest
6162
python: '3.6'
6263
args: >
@@ -81,7 +82,8 @@ jobs:
8182
python-version: ${{ matrix.python }}
8283

8384
- name: Setup Boost (Linux)
84-
if: runner.os == 'Linux'
85+
# Can't use boost + define _
86+
if: runner.os == 'Linux' && matrix.python != '3.6'
8587
run: sudo apt-get install libboost-dev
8688

8789
- name: Setup Boost (macOS)
@@ -263,6 +265,8 @@ jobs:
263265
python -m pip install -r tests/requirements.txt
264266
265267
- name: Configure
268+
env:
269+
SETUPTOOLS_USE_DISTUTILS: stdlib
266270
run: >
267271
cmake -S . -B build
268272
-DCMAKE_BUILD_TYPE=Debug
@@ -576,38 +580,38 @@ jobs:
576580
set +e; source /opt/intel/oneapi/setvars.sh; set -e
577581
cmake --build build-11 --target test_cmake_build
578582
579-
- name: Configure C++17
583+
- name: Configure C++14
580584
run: |
581585
set +e; source /opt/intel/oneapi/setvars.sh; set -e
582-
cmake -S . -B build-17 \
586+
cmake -S . -B build-14 \
583587
-DPYBIND11_WERROR=ON \
584588
-DDOWNLOAD_CATCH=ON \
585589
-DDOWNLOAD_EIGEN=OFF \
586-
-DCMAKE_CXX_STANDARD=17 \
590+
-DCMAKE_CXX_STANDARD=14 \
587591
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
588592
-DCMAKE_CXX_COMPILER=$(which icpc) \
589593
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
590594
591-
- name: Build C++17
595+
- name: Build C++14
592596
run: |
593597
set +e; source /opt/intel/oneapi/setvars.sh; set -e
594-
cmake --build build-17 -j 2 -v
598+
cmake --build build-14 -j 2 -v
595599
596-
- name: Python tests C++17
600+
- name: Python tests C++14
597601
run: |
598602
set +e; source /opt/intel/oneapi/setvars.sh; set -e
599603
sudo service apport stop
600-
cmake --build build-17 --target check
604+
cmake --build build-14 --target check
601605
602-
- name: C++ tests C++17
606+
- name: C++ tests C++14
603607
run: |
604608
set +e; source /opt/intel/oneapi/setvars.sh; set -e
605-
cmake --build build-17 --target cpptest
609+
cmake --build build-14 --target cpptest
606610
607-
- name: Interface test C++17
611+
- name: Interface test C++14
608612
run: |
609613
set +e; source /opt/intel/oneapi/setvars.sh; set -e
610-
cmake --build build-17 --target test_cmake_build
614+
cmake --build build-14 --target test_cmake_build
611615
612616
613617
# Testing on CentOS (manylinux uses a centos base, and this is an easy way

‎.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 2021-12-03 11:12:00.501984137 -0800
2-
+++ ci_sh_def.yml 2021-12-03 11:12:25.675660000 -0800
1+
--- ci.yml 2021-12-29 13:23:17.380542309 -0800
2+
+++ ci_sh_def.yml 2021-12-29 13:25:04.832676256 -0800
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-
@@ -106,6 +118,7 @@
30+
@@ -108,6 +120,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-
@@ -133,6 +146,7 @@
38+
@@ -135,6 +148,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-
@@ -154,6 +168,7 @@
46+
@@ -156,6 +170,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-
@@ -255,6 +270,7 @@
54+
@@ -259,6 +274,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-
@@ -309,6 +325,7 @@
62+
@@ -313,6 +329,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-
@@ -338,7 +355,8 @@
70+
@@ -342,7 +359,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-
@@ -418,7 +436,7 @@
80+
@@ -422,7 +440,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,63 +86,63 @@
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-
@@ -477,6 +495,7 @@
89+
@@ -481,6 +499,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-
@@ -532,6 +551,7 @@
97+
@@ -536,6 +555,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-
@@ -564,6 +584,7 @@
105+
@@ -568,6 +588,7 @@
106106
-DDOWNLOAD_CATCH=ON \
107107
-DDOWNLOAD_EIGEN=OFF \
108-
-DCMAKE_CXX_STANDARD=17 \
108+
-DCMAKE_CXX_STANDARD=14 \
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-
@@ -636,6 +657,7 @@
113+
@@ -640,6 +661,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-
@@ -686,6 +708,7 @@
121+
@@ -690,6 +712,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-
@@ -778,6 +801,7 @@
129+
@@ -782,6 +805,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+
@@ -829,6 +853,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

143143
- name: Build C++14
144144
run: cmake --build build -j 2
145-
@@ -850,11 +875,11 @@
145+
@@ -854,11 +879,11 @@
146146
- python: 2.7
147147
std: 17
148148
args: >
@@ -156,7 +156,7 @@
156156

157157
steps:
158158
- uses: actions/checkout@v2
159-
@@ -923,7 +948,7 @@
159+
@@ -927,7 +952,7 @@
160160
- name: Configure C++11
161161
# LTO leads to many undefined reference like
162162
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -165,7 +165,7 @@
165165

166166
- name: Build C++11
167167
run: cmake --build build -j 2
168-
@@ -941,7 +966,7 @@
168+
@@ -945,7 +970,7 @@
169169
run: git clean -fdx
170170

171171
- name: Configure C++14
@@ -174,7 +174,7 @@
174174

175175
- name: Build C++14
176176
run: cmake --build build2 -j 2
177-
@@ -959,7 +984,7 @@
177+
@@ -963,7 +988,7 @@
178178
run: git clean -fdx
179179

180180
- name: Configure C++17

0 commit comments

Comments
 (0)