Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-30 00:47:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tracking ci.yml changes from master.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-06-19 15:56:08 -07:00
parent fb7452ce39
commit 7f41bea169
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/ci_sh_def.yml vendored
View File

@ -6,6 +6,7 @@
# patch -i ci_sh_def.yml.patch -o ci_sh_def.yml # patch -i ci_sh_def.yml.patch -o ci_sh_def.yml
# To update the patch file after making changes to ci_sh.yml: # To update the patch file after making changes to ci_sh.yml:
# diff -u ci.yml ci_sh_def.yml > ci_sh_def.yml.patch # diff -u ci.yml ci_sh_def.yml > ci_sh_def.yml.patch
# git commit -a -m 'Tracking ci.yml changes from master.'
# #
# Thanks a lot to @rhaschke for PR #2930! # Thanks a lot to @rhaschke for PR #2930!
@ -165,7 +166,7 @@ jobs:
# MSVC, but for now, this action works: # MSVC, but for now, this action works:
- name: Prepare compiler environment for Windows 🐍 2.7 - name: Prepare compiler environment for Windows 🐍 2.7
if: matrix.python == 2.7 && runner.os == 'Windows' if: matrix.python == 2.7 && runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1.8.1 uses: ilammy/msvc-dev-cmd@v1.9.0
with: with:
arch: x64 arch: x64
@ -762,7 +763,7 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1.9 uses: jwlawson/actions-setup-cmake@v1.9
- name: Prepare MSVC - name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.8.1 uses: ilammy/msvc-dev-cmd@v1.9.0
with: with:
arch: x86 arch: x86
@ -809,7 +810,7 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1.9 uses: jwlawson/actions-setup-cmake@v1.9
- name: Prepare MSVC - name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.8.1 uses: ilammy/msvc-dev-cmd@v1.9.0
with: with:
toolset: 14.0 toolset: 14.0

33
.github/workflows/ci_sh_def.yml.patch vendored
View File

@ -1,6 +1,6 @@
--- ci.yml 2021-06-18 01:41:07.246849382 -0700 --- ci.yml 2021-06-19 15:52:36.772992808 -0700
+++ ci_sh_def.yml 2021-06-18 01:41:47.114491643 -0700 +++ ci_sh_def.yml 2021-06-19 15:55:28.236643785 -0700
@@ -1,4 +1,15 @@ @@ -1,4 +1,16 @@
-name: CI-SH-AVL -name: CI-SH-AVL
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES: +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
+# ci.yml +# ci.yml
@ -10,6 +10,7 @@
+# patch -i ci_sh_def.yml.patch -o ci_sh_def.yml +# patch -i ci_sh_def.yml.patch -o ci_sh_def.yml
+# To update the patch file after making changes to ci_sh.yml: +# To update the patch file after making changes to ci_sh.yml:
+# diff -u ci.yml ci_sh_def.yml > ci_sh_def.yml.patch +# diff -u ci.yml ci_sh_def.yml > ci_sh_def.yml.patch
+# git commit -a -m 'Tracking ci.yml changes from master.'
+# +#
+# Thanks a lot to @rhaschke for PR #2930! +# Thanks a lot to @rhaschke for PR #2930!
+ +
@ -17,7 +18,7 @@
on: on:
workflow_dispatch: workflow_dispatch:
@@ -104,6 +115,7 @@ @@ -104,6 +116,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_STANDARD=11
@ -25,7 +26,7 @@
${{ matrix.args }} ${{ matrix.args }}
- name: Build C++11 - name: Build C++11
@@ -131,6 +143,7 @@ @@ -131,6 +144,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17
@ -33,7 +34,7 @@
${{ matrix.args }} ${{ matrix.args }}
${{ matrix.args2 }} ${{ matrix.args2 }}
@@ -287,6 +300,7 @@ @@ -287,6 +301,7 @@
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_CXX_STANDARD=${{ matrix.std }}
@ -41,7 +42,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build - name: Build
@@ -316,7 +330,8 @@ @@ -316,7 +331,8 @@
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
- name: Configure - name: Configure
@ -51,7 +52,7 @@
- name: Build - name: Build
run: cmake --build build -j2 --verbose run: cmake --build build -j2 --verbose
@@ -396,7 +411,7 @@ @@ -396,7 +412,7 @@
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \ cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
-DCMAKE_CXX_STANDARD=11 \ -DCMAKE_CXX_STANDARD=11 \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \ -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@ -60,7 +61,7 @@
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp" -DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
# Building before installing Pip should produce a warning but not an error # Building before installing Pip should produce a warning but not an error
@@ -455,6 +470,7 @@ @@ -455,6 +471,7 @@
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_CXX_STANDARD=${{ matrix.std }}
@ -68,7 +69,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build - name: Build
@@ -510,6 +526,7 @@ @@ -510,6 +527,7 @@
-DDOWNLOAD_CATCH=ON \ -DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \ -DDOWNLOAD_EIGEN=OFF \
-DCMAKE_CXX_STANDARD=11 \ -DCMAKE_CXX_STANDARD=11 \
@ -76,7 +77,7 @@
-DCMAKE_CXX_COMPILER=$(which icpc) \ -DCMAKE_CXX_COMPILER=$(which icpc) \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
@@ -542,6 +559,7 @@ @@ -542,6 +560,7 @@
-DDOWNLOAD_CATCH=ON \ -DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \ -DDOWNLOAD_EIGEN=OFF \
-DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_STANDARD=17 \
@ -84,7 +85,7 @@
-DCMAKE_CXX_COMPILER=$(which icpc) \ -DCMAKE_CXX_COMPILER=$(which icpc) \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
@@ -612,6 +630,7 @@ @@ -612,6 +631,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_STANDARD=11
@ -92,7 +93,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build - name: Build
@@ -662,6 +681,7 @@ @@ -662,6 +682,7 @@
cmake ../pybind11-tests cmake ../pybind11-tests
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
@ -100,7 +101,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
working-directory: /build-tests working-directory: /build-tests
@@ -757,6 +777,7 @@ @@ -757,6 +778,7 @@
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
@ -108,7 +109,7 @@
${{ matrix.args }} ${{ matrix.args }}
- name: Build C++11 - name: Build C++11
run: cmake --build build -j 2 run: cmake --build build -j 2
@@ -803,6 +824,7 @@ @@ -803,6 +825,7 @@
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
@ -116,7 +117,7 @@
- name: Build C++14 - name: Build C++14
run: cmake --build build -j 2 run: cmake --build build -j 2
@@ -823,12 +845,13 @@ @@ -823,12 +846,13 @@
- 3.7 - 3.7
std: std:
- 14 - 14