Zengtudor
/
pybind11
mirror of https://github.com/pybind/pybind11.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tracking ci.yml changes from master.

This commit is contained in:
Ralf W. Grosse-Kunstleve 2024-02-20 12:29:51 -08:00
parent 47422c53d0
commit 10283c2ef4
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,11 +99,11 @@ jobs:
run: brew install boost run: brew install boost
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.14 uses: jwlawson/actions-setup-cmake@v2.0
- name: Cache wheels - name: Cache wheels
if: runner.os == 'macOS' if: runner.os == 'macOS'
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
# This path is specific to macOS - we really only need it for PyPy NumPy wheels # This path is specific to macOS - we really only need it for PyPy NumPy wheels
# See https://github.com/actions/cache/blob/master/examples.md#python---pip # See https://github.com/actions/cache/blob/master/examples.md#python---pip
@ -230,11 +230,11 @@ jobs:
debug: ${{ matrix.python-debug }} debug: ${{ matrix.python-debug }}
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.14 uses: jwlawson/actions-setup-cmake@v2.0
- name: Valgrind cache - name: Valgrind cache
if: matrix.valgrind if: matrix.valgrind
uses: actions/cache@v3 uses: actions/cache@v4
id: cache-valgrind id: cache-valgrind
with: with:
path: valgrind path: valgrind
@ -502,7 +502,7 @@ jobs:
run: python3 -m pip install --upgrade pip run: python3 -m pip install --upgrade pip
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.14 uses: jwlawson/actions-setup-cmake@v2.0
- name: Configure - name: Configure
shell: bash shell: bash
@ -549,8 +549,6 @@ jobs:
# Testing on ICC using the oneAPI apt repo # Testing on ICC using the oneAPI apt repo
icc: icc:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy:
fail-fast: false
name: "🐍 3 • ICC latest • x64" name: "🐍 3 • ICC latest • x64"
@ -821,7 +819,7 @@ jobs:
architecture: x86 architecture: x86
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.14 uses: jwlawson/actions-setup-cmake@v2.0
- name: Prepare MSVC - name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.13.0 uses: ilammy/msvc-dev-cmd@v1.13.0
@ -875,7 +873,7 @@ jobs:
architecture: x86 architecture: x86
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.14 uses: jwlawson/actions-setup-cmake@v2.0
- name: Prepare MSVC - name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.13.0 uses: ilammy/msvc-dev-cmd@v1.13.0
@ -927,7 +925,7 @@ jobs:
python3 -m pip install -r tests/requirements.txt python3 -m pip install -r tests/requirements.txt
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.14 uses: jwlawson/actions-setup-cmake@v2.0
- name: Configure C++20 - name: Configure C++20
run: > run: >
@ -1096,7 +1094,7 @@ jobs:
python-version: ${{ matrix.python }} python-version: ${{ matrix.python }}
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.14 uses: jwlawson/actions-setup-cmake@v2.0
- name: Install ninja-build tool - name: Install ninja-build tool
uses: seanmiddleditch/gha-setup-ninja@v4 uses: seanmiddleditch/gha-setup-ninja@v4
@ -1167,7 +1165,7 @@ jobs:
run: clang++ --version run: clang++ --version
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.14 uses: jwlawson/actions-setup-cmake@v2.0
- name: Run pip installs - name: Run pip installs
run: | run: |

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

@ -1,5 +1,5 @@
--- ci.yml 2024-01-16 21:10:28.100295655 -0800 --- ci.yml 2024-02-20 12:29:08.800226093 -0800
+++ ci_sh_def.yml 2024-01-16 21:10:56.792251785 -0800 +++ ci_sh_def.yml 2024-02-20 12:29:39.408187912 -0800
@@ -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:
@ -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"
@@ -567,6 +586,7 @@ @@ -565,6 +584,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)")
@@ -599,6 +619,7 @@ @@ -597,6 +617,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)")
@@ -672,6 +693,7 @@ @@ -670,6 +691,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
@@ -722,6 +744,7 @@ @@ -720,6 +742,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
@@ -817,6 +840,7 @@ @@ -815,6 +838,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
@@ -871,6 +895,7 @@ @@ -869,6 +893,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
@@ -911,6 +936,7 @@ @@ -909,6 +934,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
@@ -931,6 +957,7 @@ @@ -929,6 +955,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
@@ -983,6 +1010,7 @@ @@ -981,6 +1008,7 @@
run: >- run: >-
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
@ -173,7 +173,7 @@
-S . -B build -S . -B build
- name: Build C++11 - name: Build C++11
@@ -1004,6 +1032,7 @@ @@ -1002,6 +1030,7 @@
run: >- run: >-
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
@ -181,7 +181,7 @@
-S . -B build2 -S . -B build2
- name: Build C++14 - name: Build C++14
@@ -1025,6 +1054,7 @@ @@ -1023,6 +1052,7 @@
run: >- run: >-
cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
@ -189,7 +189,7 @@
-S . -B build3 -S . -B build3
- name: Build C++17 - name: Build C++17
@@ -1092,6 +1122,7 @@ @@ -1090,6 +1120,7 @@
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17
@ -197,7 +197,7 @@
- name: Build - name: Build
run: cmake --build . -j 2 run: cmake --build . -j 2
@@ -1157,6 +1188,7 @@ @@ -1155,6 +1186,7 @@
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17
@ -205,7 +205,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build - name: Build
@@ -1180,6 +1212,7 @@ @@ -1178,6 +1210,7 @@
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17