From bf77a740fa42503fbe833273b63cd852804925b4 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 3 Aug 2024 10:15:51 +0200 Subject: [PATCH] Revert "feat: use GHA to build s390x/ppc64le images" This reverts commit 7fccd9c3c38c5101dffdf5550899fd373d8a7377. --- .github/workflows/build.yml | 12 ++++-------- .travis.yml | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81b0bb9e9..7364c196d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,15 +36,11 @@ jobs: strategy: fail-fast: false matrix: - policy: ["manylinux2014", "manylinux_2_28", "musllinux_1_1", "musllinux_1_2"] - platform: ["x86_64", "s390x", "ppc64le"] + policy: ["manylinux2014", "musllinux_1_1", "musllinux_1_2"] + platform: ["i686", "x86_64"] include: - - policy: "manylinux2014" - platform: "i686" - - policy: "musllinux_1_1" - platform: "i686" - - policy: "musllinux_1_2" - platform: "i686" + - policy: "manylinux_2_28" + platform: "x86_64" env: POLICY: ${{ matrix.policy }} diff --git a/.travis.yml b/.travis.yml index 7523c7ff3..19dfddfc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,34 +26,34 @@ jobs: virt: vm group: edge env: POLICY="manylinux2014" PLATFORM="aarch64" - #- arch: s390x - # env: POLICY="manylinux2014" PLATFORM="s390x" - #- arch: ppc64le - # env: POLICY="manylinux2014" PLATFORM="ppc64le" + - arch: s390x + env: POLICY="manylinux2014" PLATFORM="s390x" + - arch: ppc64le + env: POLICY="manylinux2014" PLATFORM="ppc64le" - arch: arm64-graviton2 virt: vm group: edge env: POLICY="manylinux_2_28" PLATFORM="aarch64" - #- arch: s390x - # env: POLICY="manylinux_2_28" PLATFORM="s390x" - #- arch: ppc64le - # env: POLICY="manylinux_2_28" PLATFORM="ppc64le" + - arch: s390x + env: POLICY="manylinux_2_28" PLATFORM="s390x" + - arch: ppc64le + env: POLICY="manylinux_2_28" PLATFORM="ppc64le" - arch: arm64-graviton2 virt: vm group: edge env: POLICY="musllinux_1_1" PLATFORM="aarch64" - #- arch: s390x - # env: POLICY="musllinux_1_1" PLATFORM="s390x" - #- arch: ppc64le - # env: POLICY="musllinux_1_1" PLATFORM="ppc64le" + - arch: s390x + env: POLICY="musllinux_1_1" PLATFORM="s390x" + - arch: ppc64le + env: POLICY="musllinux_1_1" PLATFORM="ppc64le" - arch: arm64-graviton2 virt: vm group: edge env: POLICY="musllinux_1_2" PLATFORM="aarch64" - #- arch: s390x - # env: POLICY="musllinux_1_2" PLATFORM="s390x" - #- arch: ppc64le - # env: POLICY="musllinux_1_2" PLATFORM="ppc64le" + - arch: s390x + env: POLICY="musllinux_1_2" PLATFORM="s390x" + - arch: ppc64le + env: POLICY="musllinux_1_2" PLATFORM="ppc64le" before_install: - if [ -d "${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM}" ]; then cp -rlf ${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM} ./; fi