Tracking ci.yml changes from master.

This commit is contained in:
Ralf W. Grosse-Kunstleve 2023-06-17 07:15:57 -07:00
parent eb510d5131
commit 4a52027a51
2 changed files with 34 additions and 33 deletions

View File

@ -29,6 +29,7 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
env: env:
PIP_BREAK_SYSTEM_PACKAGES: 1
PIP_ONLY_BINARY: numpy PIP_ONLY_BINARY: numpy
FORCE_COLOR: 3 FORCE_COLOR: 3
PYTEST_TIMEOUT: 300 PYTEST_TIMEOUT: 300
@ -473,16 +474,16 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- { gcc: 7, std: 11 } - { gcc: 7, std: 11, container_suffix: "" }
- { gcc: 7, std: 17 } - { gcc: 7, std: 17, container_suffix: "" }
- { gcc: 8, std: 14 } - { gcc: 8, std: 14, container_suffix: "" }
- { gcc: 8, std: 17 } - { gcc: 8, std: 17, container_suffix: "" }
- { gcc: 10, std: 17 } - { gcc: 10, std: 17, container_suffix: "-bullseye" }
- { gcc: 11, std: 20 } - { gcc: 11, std: 20, container_suffix: "" }
- { gcc: 12, std: 20 } - { gcc: 12, std: 20, container_suffix: "" }
name: "🐍 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64" name: "🐍 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64"
container: "gcc:${{ matrix.gcc }}" container: "gcc:${{ matrix.gcc }}${{ matrix.container_suffix }}"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View File

@ -1,5 +1,5 @@
--- ci.yml 2023-06-10 10:16:11.979371205 -0700 --- ci.yml 2023-06-17 07:10:16.997113344 -0700
+++ ci_sh_def.yml 2023-06-10 10:17:19.667308150 -0700 +++ ci_sh_def.yml 2023-06-17 07:15:45.148706667 -0700
@@ -1,4 +1,16 @@ @@ -1,4 +1,16 @@
-name: CI -name: CI
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES: +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@ -27,7 +27,7 @@
cancel-in-progress: true cancel-in-progress: true
env: env:
@@ -116,6 +128,7 @@ @@ -117,6 +129,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_STANDARD=11
@ -35,7 +35,7 @@
${{ matrix.args }} ${{ matrix.args }}
- name: Build C++11 - name: Build C++11
@@ -145,6 +158,7 @@ @@ -146,6 +159,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17
@ -43,7 +43,7 @@
${{ matrix.args }} ${{ matrix.args }}
- name: Build - name: Build
@@ -166,6 +180,7 @@ @@ -167,6 +181,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17
@ -51,7 +51,7 @@
-DPYBIND11_INTERNALS_VERSION=10000000 -DPYBIND11_INTERNALS_VERSION=10000000
${{ matrix.args }} ${{ matrix.args }}
@@ -252,6 +267,7 @@ @@ -253,6 +268,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17
@ -59,7 +59,7 @@
- name: Build - name: Build
run: cmake --build build -j 2 run: cmake --build build -j 2
@@ -317,6 +333,7 @@ @@ -318,6 +334,7 @@
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_CXX_STANDARD=${{ matrix.std }}
@ -67,7 +67,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build - name: Build
@@ -346,7 +363,7 @@ @@ -347,7 +364,7 @@
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
@ -76,7 +76,7 @@
- name: Build - name: Build
run: cmake --build build -j2 --verbose run: cmake --build build -j2 --verbose
@@ -427,7 +444,7 @@ @@ -428,7 +445,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)") \
@ -85,7 +85,7 @@
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp" -DPYBIND11_TEST_FILTER="test_smart_ptr.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
@@ -486,6 +503,7 @@ @@ -487,6 +504,7 @@
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_CXX_STANDARD=${{ matrix.std }}
@ -93,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
@@ -508,6 +526,7 @@ @@ -509,6 +527,7 @@
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_CXX_STANDARD=${{ matrix.std }}
@ -101,7 +101,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp" "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
@@ -559,6 +578,7 @@ @@ -560,6 +579,7 @@
-DDOWNLOAD_CATCH=ON \ -DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \ -DDOWNLOAD_EIGEN=OFF \
-DCMAKE_CXX_STANDARD=11 \ -DCMAKE_CXX_STANDARD=11 \
@ -109,7 +109,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)")
@@ -591,6 +611,7 @@ @@ -592,6 +612,7 @@
-DDOWNLOAD_CATCH=ON \ -DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \ -DDOWNLOAD_EIGEN=OFF \
-DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_STANDARD=17 \
@ -117,7 +117,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)")
@@ -658,6 +679,7 @@ @@ -659,6 +680,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_STANDARD=11
@ -125,7 +125,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build - name: Build
@@ -708,6 +730,7 @@ @@ -709,6 +731,7 @@
cmake ../pybind11-tests cmake ../pybind11-tests
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
@ -133,7 +133,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
@@ -803,6 +826,7 @@ @@ -804,6 +827,7 @@
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
@ -141,7 +141,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
@@ -857,6 +881,7 @@ @@ -858,6 +882,7 @@
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
@ -149,7 +149,7 @@
${{ matrix.args }} ${{ matrix.args }}
- name: Build C++11 - name: Build C++11
run: cmake --build build --config Debug -j 2 run: cmake --build build --config Debug -j 2
@@ -897,6 +922,7 @@ @@ -898,6 +923,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_STANDARD=20
@ -157,7 +157,7 @@
- name: Build C++20 - name: Build C++20
run: cmake --build build -j 2 run: cmake --build build -j 2
@@ -917,6 +943,7 @@ @@ -918,6 +944,7 @@
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_STANDARD=20
@ -165,7 +165,7 @@
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp" "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
- name: Build C++20 - Exercise cmake -DPYBIND11_TEST_OVERRIDE - name: Build C++20 - Exercise cmake -DPYBIND11_TEST_OVERRIDE
@@ -959,7 +986,7 @@ @@ -960,7 +987,7 @@
- name: Configure C++11 - name: Configure C++11
# LTO leads to many undefined reference like # LTO leads to many undefined reference like
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&) # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@ -174,7 +174,7 @@
- name: Build C++11 - name: Build C++11
run: cmake --build build -j 2 run: cmake --build build -j 2
@@ -977,7 +1004,7 @@ @@ -978,7 +1005,7 @@
run: git clean -fdx run: git clean -fdx
- name: Configure C++14 - name: Configure C++14
@ -183,7 +183,7 @@
- name: Build C++14 - name: Build C++14
run: cmake --build build2 -j 2 run: cmake --build build2 -j 2
@@ -995,7 +1022,7 @@ @@ -996,7 +1023,7 @@
run: git clean -fdx run: git clean -fdx
- name: Configure C++17 - name: Configure C++17
@ -192,7 +192,7 @@
- name: Build C++17 - name: Build C++17
run: cmake --build build3 -j 2 run: cmake --build build3 -j 2
@@ -1062,6 +1089,7 @@ @@ -1063,6 +1090,7 @@
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17
@ -200,7 +200,7 @@
- name: Build - name: Build
run: cmake --build . -j 2 run: cmake --build . -j 2
@@ -1127,6 +1155,7 @@ @@ -1128,6 +1156,7 @@
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17
@ -208,7 +208,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build - name: Build
@@ -1150,6 +1179,7 @@ @@ -1151,6 +1180,7 @@
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17