From 3ec984e1ed7265ac152e6760c68a0bad97d5a2bd Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Sun, 4 Dec 2022 10:46:05 -0800 Subject: [PATCH 1/5] =?UTF-8?q?Replace=20=F0=9F=90=8D=203.6=20=E2=80=A2=20?= =?UTF-8?q?ubuntu-latest=20=E2=80=A2=20x64=20-DPYBIND11=5FFINDPYTHON=3DON?= =?UTF-8?q?=20-DCMAKE=5FCXX=5FFLAGS=3D"-D=5F=3D1"=20with=203.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd99ddd338..072d561e01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,6 @@ jobs: matrix: runs-on: [ubuntu-latest, windows-2022, macos-latest] python: - - '3.6' - '3.9' - '3.10' - '3.11' @@ -43,7 +42,7 @@ jobs: include: # Just add a key - runs-on: ubuntu-latest - python: '3.6' + python: '3.9' args: > -DPYBIND11_FINDPYTHON=ON -DCMAKE_CXX_FLAGS="-D_=1" From fe06b70312cc7bb11b06f2b4d717e8db49fe76fd Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Sun, 4 Dec 2022 12:59:05 -0800 Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"Replace=20=F0=9F=90=8D=203.6=20?= =?UTF-8?q?=E2=80=A2=20ubuntu-latest=20=E2=80=A2=20x64=20-DPYBIND11=5FFIND?= =?UTF-8?q?PYTHON=3DON=20-DCMAKE=5FCXX=5FFLAGS=3D"-D=5F=3D1"=20with=203.9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3ec984e1ed7265ac152e6760c68a0bad97d5a2bd. --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 072d561e01..bd99ddd338 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: matrix: runs-on: [ubuntu-latest, windows-2022, macos-latest] python: + - '3.6' - '3.9' - '3.10' - '3.11' @@ -42,7 +43,7 @@ jobs: include: # Just add a key - runs-on: ubuntu-latest - python: '3.9' + python: '3.6' args: > -DPYBIND11_FINDPYTHON=ON -DCMAKE_CXX_FLAGS="-D_=1" From cdfd99526a9d3c172691685ac17054bfe76590fc Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Sun, 4 Dec 2022 13:03:07 -0800 Subject: [PATCH 3/5] Systematically change all active ubuntu-latest to ubuntu-20.04, except in upstream.yml --- .github/workflows/ci.yml | 22 +++++++++++----------- .github/workflows/configure.yml | 4 ++-- .github/workflows/format.yml | 4 ++-- .github/workflows/labeler.yml | 2 +- .github/workflows/pip.yml | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd99ddd338..b20c67d5b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - runs-on: [ubuntu-latest, windows-2022, macos-latest] + runs-on: [ubuntu-20.04, windows-2022, macos-latest] python: - '3.6' - '3.9' @@ -42,12 +42,12 @@ jobs: # We support an optional key: args, for cmake args include: # Just add a key - - runs-on: ubuntu-latest + - runs-on: ubuntu-20.04 python: '3.6' args: > -DPYBIND11_FINDPYTHON=ON -DCMAKE_CXX_FLAGS="-D_=1" - - runs-on: ubuntu-latest + - runs-on: ubuntu-20.04 python: 'pypy-3.8' args: > -DPYBIND11_FINDPYTHON=ON @@ -194,7 +194,7 @@ jobs: python-debug: false name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64" - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -265,7 +265,7 @@ jobs: # Testing on clang using the excellent silkeh clang docker images clang: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -327,7 +327,7 @@ jobs: # Testing NVCC; forces sources to behave like .cu files cuda: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 name: "🐍 3.10 • CUDA 11.7 • Ubuntu 22.04" container: nvidia/cuda:11.7.0-devel-ubuntu22.04 @@ -394,7 +394,7 @@ jobs: # Testing on CentOS 7 + PGI compilers, which seems to require more workarounds centos-nvhpc7: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 name: "🐍 3 • CentOS7 / PGI 22.9 • x64" container: centos:7 @@ -443,7 +443,7 @@ jobs: # Testing on GCC using the GCC docker images (only recent images supported) gcc: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -593,7 +593,7 @@ jobs: # Testing on CentOS (manylinux uses a centos base, and this is an easy way # to get GCC 4.8, which is the manylinux1 compiler). centos: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -650,7 +650,7 @@ jobs: # This tests an "install" with the CMake tools install-classic: name: "🐍 3.7 • Debian • x86 • Install" - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: i386/debian:buster steps: @@ -694,7 +694,7 @@ jobs: # basic validation check on the SDist. doxygen: name: "Documentation build test" - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index 5ec0dd462f..05e972c754 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -16,12 +16,12 @@ jobs: strategy: fail-fast: false matrix: - runs-on: [ubuntu-latest, macos-latest, windows-latest] + runs-on: [ubuntu-20.04, macos-latest, windows-latest] arch: [x64] cmake: ["3.23"] include: - - runs-on: ubuntu-latest + - runs-on: ubuntu-20.04 arch: x64 cmake: 3.4 diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 31d893c479..892c4d7112 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -18,7 +18,7 @@ env: jobs: pre-commit: name: Format - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -35,7 +35,7 @@ jobs: # When making changes here, please also review the "Clang-Tidy" section # in .github/CONTRIBUTING.md and update as needed. name: Clang-Tidy - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: silkeh/clang:13 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 165a2fd87b..e31765bd52 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -6,7 +6,7 @@ on: jobs: label: name: Labeler - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/labeler@main diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index b787187ee0..78454c39d0 100644 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -42,8 +42,8 @@ jobs: # This runs the packaging tests and also builds and saves the packages as # artifacts. packaging: - name: 🐍 3.8 • 📦 & 📦 tests • ubuntu-latest - runs-on: ubuntu-latest + name: 🐍 3.8 • 📦 & 📦 tests • ubuntu-20.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -85,7 +85,7 @@ jobs: # When a GitHub release is made, upload the artifacts to PyPI upload: name: Upload to PyPI - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 if: github.event_name == 'release' && github.event.action == 'published' needs: [packaging] From 9917e99b2bcba89a6caee6f007a471f7528fc7f8 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Sun, 4 Dec 2022 13:58:40 -0800 Subject: [PATCH 4/5] Revert "Systematically change all active ubuntu-latest to ubuntu-20.04, except in upstream.yml" This reverts commit cdfd99526a9d3c172691685ac17054bfe76590fc. --- .github/workflows/ci.yml | 22 +++++++++++----------- .github/workflows/configure.yml | 4 ++-- .github/workflows/format.yml | 4 ++-- .github/workflows/labeler.yml | 2 +- .github/workflows/pip.yml | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b20c67d5b9..bd99ddd338 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - runs-on: [ubuntu-20.04, windows-2022, macos-latest] + runs-on: [ubuntu-latest, windows-2022, macos-latest] python: - '3.6' - '3.9' @@ -42,12 +42,12 @@ jobs: # We support an optional key: args, for cmake args include: # Just add a key - - runs-on: ubuntu-20.04 + - runs-on: ubuntu-latest python: '3.6' args: > -DPYBIND11_FINDPYTHON=ON -DCMAKE_CXX_FLAGS="-D_=1" - - runs-on: ubuntu-20.04 + - runs-on: ubuntu-latest python: 'pypy-3.8' args: > -DPYBIND11_FINDPYTHON=ON @@ -194,7 +194,7 @@ jobs: python-debug: false name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64" - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -265,7 +265,7 @@ jobs: # Testing on clang using the excellent silkeh clang docker images clang: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -327,7 +327,7 @@ jobs: # Testing NVCC; forces sources to behave like .cu files cuda: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest name: "🐍 3.10 • CUDA 11.7 • Ubuntu 22.04" container: nvidia/cuda:11.7.0-devel-ubuntu22.04 @@ -394,7 +394,7 @@ jobs: # Testing on CentOS 7 + PGI compilers, which seems to require more workarounds centos-nvhpc7: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest name: "🐍 3 • CentOS7 / PGI 22.9 • x64" container: centos:7 @@ -443,7 +443,7 @@ jobs: # Testing on GCC using the GCC docker images (only recent images supported) gcc: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -593,7 +593,7 @@ jobs: # Testing on CentOS (manylinux uses a centos base, and this is an easy way # to get GCC 4.8, which is the manylinux1 compiler). centos: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -650,7 +650,7 @@ jobs: # This tests an "install" with the CMake tools install-classic: name: "🐍 3.7 • Debian • x86 • Install" - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: i386/debian:buster steps: @@ -694,7 +694,7 @@ jobs: # basic validation check on the SDist. doxygen: name: "Documentation build test" - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index 05e972c754..5ec0dd462f 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -16,12 +16,12 @@ jobs: strategy: fail-fast: false matrix: - runs-on: [ubuntu-20.04, macos-latest, windows-latest] + runs-on: [ubuntu-latest, macos-latest, windows-latest] arch: [x64] cmake: ["3.23"] include: - - runs-on: ubuntu-20.04 + - runs-on: ubuntu-latest arch: x64 cmake: 3.4 diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 892c4d7112..31d893c479 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -18,7 +18,7 @@ env: jobs: pre-commit: name: Format - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -35,7 +35,7 @@ jobs: # When making changes here, please also review the "Clang-Tidy" section # in .github/CONTRIBUTING.md and update as needed. name: Clang-Tidy - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: silkeh/clang:13 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index e31765bd52..165a2fd87b 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -6,7 +6,7 @@ on: jobs: label: name: Labeler - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/labeler@main diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index 78454c39d0..b787187ee0 100644 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -42,8 +42,8 @@ jobs: # This runs the packaging tests and also builds and saves the packages as # artifacts. packaging: - name: 🐍 3.8 • 📦 & 📦 tests • ubuntu-20.04 - runs-on: ubuntu-20.04 + name: 🐍 3.8 • 📦 & 📦 tests • ubuntu-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -85,7 +85,7 @@ jobs: # When a GitHub release is made, upload the artifacts to PyPI upload: name: Upload to PyPI - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: github.event_name == 'release' && github.event.action == 'published' needs: [packaging] From 1a311b3decd76a42fb9e6140ba326c7ed9d5f4a2 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Sun, 4 Dec 2022 14:02:38 -0800 Subject: [PATCH 5/5] Change only some ubuntu-latest to ubuntu-20.04 --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/configure.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd99ddd338..a6f2624dba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - runs-on: [ubuntu-latest, windows-2022, macos-latest] + runs-on: [ubuntu-20.04, windows-2022, macos-latest] python: - '3.6' - '3.9' @@ -42,12 +42,12 @@ jobs: # We support an optional key: args, for cmake args include: # Just add a key - - runs-on: ubuntu-latest + - runs-on: ubuntu-20.04 python: '3.6' args: > -DPYBIND11_FINDPYTHON=ON -DCMAKE_CXX_FLAGS="-D_=1" - - runs-on: ubuntu-latest + - runs-on: ubuntu-20.04 python: 'pypy-3.8' args: > -DPYBIND11_FINDPYTHON=ON @@ -194,7 +194,7 @@ jobs: python-debug: false name: "🐍 ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64" - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index 5ec0dd462f..05e972c754 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -16,12 +16,12 @@ jobs: strategy: fail-fast: false matrix: - runs-on: [ubuntu-latest, macos-latest, windows-latest] + runs-on: [ubuntu-20.04, macos-latest, windows-latest] arch: [x64] cmake: ["3.23"] include: - - runs-on: ubuntu-latest + - runs-on: ubuntu-20.04 arch: x64 cmake: 3.4