From 08259c7a891530b90a2d5231de9290b140c64961 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Fri, 16 Jun 2023 14:23:58 -0700 Subject: [PATCH 1/3] Systematically add PIP_BREAK_SYSTEM_PACKAGES to all .yml files from which pip is called. --- .github/workflows/ci.yml | 1 + .github/workflows/configure.yml | 1 + .github/workflows/pip.yml | 1 + .github/workflows/upstream.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45a6738f75..fe1cb8e6c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,7 @@ concurrency: cancel-in-progress: true env: + PIP_BREAK_SYSTEM_PACKAGES: 1 PIP_ONLY_BINARY: numpy FORCE_COLOR: 3 PYTEST_TIMEOUT: 300 diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index 4ae22281c6..82a4939004 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -13,6 +13,7 @@ permissions: contents: read env: + PIP_BREAK_SYSTEM_PACKAGES: 1 # For cmake: VERBOSE: 1 diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index c1feb6fe10..04d95a28c5 100644 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -16,6 +16,7 @@ permissions: contents: read env: + PIP_BREAK_SYSTEM_PACKAGES: 1 PIP_ONLY_BINARY: numpy jobs: diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml index d4220be228..dd8a1c9606 100644 --- a/.github/workflows/upstream.yml +++ b/.github/workflows/upstream.yml @@ -12,6 +12,7 @@ concurrency: cancel-in-progress: true env: + PIP_BREAK_SYSTEM_PACKAGES: 1 PIP_ONLY_BINARY: ":all:" # For cmake: VERBOSE: 1 From 21aac2eaf8708a8861d22643faf4a0b72dd0fa57 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Fri, 16 Jun 2023 16:12:01 -0700 Subject: [PATCH 2/3] Try gcc:10-bullseye (because gcc:10 is broken: https://github.com/docker-library/gcc/issues/95) --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe1cb8e6c1..44847d5afe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -455,17 +455,19 @@ jobs: strategy: fail-fast: false matrix: + container_suffix: + - "" include: - { gcc: 7, std: 11 } - { gcc: 7, std: 17 } - { gcc: 8, std: 14 } - { gcc: 8, std: 17 } - - { gcc: 10, std: 17 } + - { gcc: 10, std: 17, container_suffix: "-bullseye" } - { gcc: 11, std: 20 } - { gcc: 12, std: 20 } name: "🐍 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64" - container: "gcc:${{ matrix.gcc }}" + container: "gcc:${{ matrix.gcc }}${{ matrix.container_suffix }}" steps: - uses: actions/checkout@v3 From d930c48bf37770be4d73980d23dbe6356d6662dc Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Fri, 16 Jun 2023 16:44:46 -0700 Subject: [PATCH 3/3] bug fix (matrix did not work as hoped) --- .github/workflows/ci.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44847d5afe..1d5d502b00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -455,16 +455,14 @@ jobs: strategy: fail-fast: false matrix: - container_suffix: - - "" include: - - { gcc: 7, std: 11 } - - { gcc: 7, std: 17 } - - { gcc: 8, std: 14 } - - { gcc: 8, std: 17 } + - { gcc: 7, std: 11, container_suffix: "" } + - { gcc: 7, std: 17, container_suffix: "" } + - { gcc: 8, std: 14, container_suffix: "" } + - { gcc: 8, std: 17, container_suffix: "" } - { gcc: 10, std: 17, container_suffix: "-bullseye" } - - { gcc: 11, std: 20 } - - { gcc: 12, std: 20 } + - { gcc: 11, std: 20, container_suffix: "" } + - { gcc: 12, std: 20, container_suffix: "" } name: "🐍 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64" container: "gcc:${{ matrix.gcc }}${{ matrix.container_suffix }}"