Change label python312dev to gha_wf_python312dev_enable; introduce la…

…bel gha_wf_ci_disable.
google · Mar 9, 2023 · d69bb15 · d69bb15
1 parent 78479b6
commit d69bb15
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,6 +25,9 @@ jobs:
   # This is the "main" test suite, which tests a large number of different
   # versions of default compilers and Python versions in GitHub Actions.
   standard:
+    # Hint: Select the label in the PR web view.
+    if: "!contains(github.event.pull_request.labels.*.name, 'gha_wf_ci_disable')"
+
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/ci_sh_def.yml b/.github/workflows/ci_sh_def.yml
@@ -37,6 +37,9 @@ jobs:
   # This is the "main" test suite, which tests a large number of different
   # versions of default compilers and Python versions in GitHub Actions.
   standard:
+    # Hint: Select the label in the PR web view.
+    if: "!contains(github.event.pull_request.labels.*.name, 'gha_wf_ci_disable')"
+
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/ci_sh_def.yml.patch b/.github/workflows/ci_sh_def.yml.patch
@@ -1,5 +1,5 @@
---- ci.yml	2023-02-16 15:01:55.421851299 -0800
-+++ ci_sh_def.yml	2023-02-16 15:03:24.958936294 -0800
+--- ci.yml	2023-03-09 07:30:49.828172934 -0800
++++ ci_sh_def.yml	2023-03-09 07:31:08.686111794 -0800
 @@ -1,4 +1,16 @@
 -name: CI
 +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -27,47 +27,47 @@
    cancel-in-progress: true
 
  env:
-@@ -114,6 +126,7 @@
+@@ -117,6 +129,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=11
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
          ${{ matrix.args }}
 
      - name: Build C++11
-@@ -143,6 +156,7 @@
+@@ -146,6 +159,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=17
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
          ${{ matrix.args }}
 
      - name: Build
-@@ -164,6 +178,7 @@
+@@ -167,6 +181,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=17
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
          -DPYBIND11_INTERNALS_VERSION=10000000
          "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
          ${{ matrix.args }}
-@@ -251,6 +266,7 @@
+@@ -254,6 +269,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=17
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
 
      - name: Build
        run: cmake --build build -j 2
-@@ -316,6 +332,7 @@
+@@ -319,6 +335,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DCMAKE_CXX_STANDARD=${{ matrix.std }}
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
 
      - name: Build
-@@ -345,7 +362,7 @@
+@@ -348,7 +365,7 @@
        run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
 
      - name: Configure
@@ -76,7 +76,7 @@
 
      - name: Build
        run: cmake --build build -j2 --verbose
-@@ -425,7 +442,7 @@
+@@ -428,7 +445,7 @@
          cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
                              -DCMAKE_CXX_STANDARD=11 \
                              -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -85,71 +85,71 @@
                              -DPYBIND11_TEST_FILTER="test_smart_ptr.cpp"
 
      # Building before installing Pip should produce a warning but not an error
-@@ -484,6 +501,7 @@
+@@ -487,6 +504,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DCMAKE_CXX_STANDARD=${{ matrix.std }}
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
 
      - name: Build
-@@ -539,6 +557,7 @@
+@@ -542,6 +560,7 @@
          -DDOWNLOAD_CATCH=ON     \
          -DDOWNLOAD_EIGEN=OFF    \
          -DCMAKE_CXX_STANDARD=11             \
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"  \
          -DCMAKE_CXX_COMPILER=$(which icpc)  \
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
 
-@@ -571,6 +590,7 @@
+@@ -574,6 +593,7 @@
          -DDOWNLOAD_CATCH=ON     \
          -DDOWNLOAD_EIGEN=OFF    \
          -DCMAKE_CXX_STANDARD=17             \
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"  \
          -DCMAKE_CXX_COMPILER=$(which icpc)  \
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
 
-@@ -638,6 +658,7 @@
+@@ -641,6 +661,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=11
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
 
      - name: Build
-@@ -688,6 +709,7 @@
+@@ -691,6 +712,7 @@
          cmake ../pybind11-tests
          -DDOWNLOAD_CATCH=ON
          -DPYBIND11_WERROR=ON
 +        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
        working-directory: /build-tests
 
-@@ -783,6 +805,7 @@
+@@ -786,6 +808,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
 +        -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
          ${{ matrix.args }}
      - name: Build C++11
        run: cmake --build build -j 2
-@@ -837,6 +860,7 @@
+@@ -840,6 +863,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
 +        -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
          ${{ matrix.args }}
      - name: Build C++11
        run: cmake --build build --config Debug -j 2
-@@ -877,6 +901,7 @@
+@@ -880,6 +904,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=20
 +        -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
 
      - name: Build C++20
        run: cmake --build build -j 2
-@@ -924,7 +949,7 @@
+@@ -927,7 +952,7 @@
      - name: Configure C++11
        # LTO leads to many undefined reference like
        # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -158,7 +158,7 @@
 
      - name: Build C++11
        run: cmake --build build -j 2
-@@ -942,7 +967,7 @@
+@@ -945,7 +970,7 @@
        run: git clean -fdx
 
      - name: Configure C++14
@@ -167,7 +167,7 @@
 
      - name: Build C++14
        run: cmake --build build2 -j 2
-@@ -960,7 +985,7 @@
+@@ -963,7 +988,7 @@
        run: git clean -fdx
 
      - name: Configure C++17
@@ -176,15 +176,15 @@
 
      - name: Build C++17
        run: cmake --build build3 -j 2
-@@ -1027,6 +1052,7 @@
+@@ -1030,6 +1055,7 @@
            -DDOWNLOAD_EIGEN=ON
            -DCMAKE_CXX_COMPILER=clang++
            -DCMAKE_CXX_STANDARD=17
 +          -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
 
        - name: Build
          run: cmake --build . -j 2
-@@ -1092,6 +1118,7 @@
+@@ -1095,6 +1121,7 @@
            -DDOWNLOAD_EIGEN=ON
            -DCMAKE_CXX_COMPILER=clang++
            -DCMAKE_CXX_STANDARD=17

diff --git a/.github/workflows/python312dev.yml b/.github/workflows/python312dev.yml
@@ -16,8 +16,8 @@ jobs:
     name: "🐍 3.12-dev • ubuntu-latest • x64"
     runs-on: ubuntu-latest
 
-    # Hint: Select the 'python312dev' label in the PR web view.
-    if: "contains(github.event.pull_request.labels.*.name, 'python312dev')"
+    # Hint: Select the label in the PR web view.
+    if: "contains(github.event.pull_request.labels.*.name, 'gha_wf_python312dev_enable')"
 
     steps:
     - name: Show env