Skip to content

Commit 0689b92

Browse files
authored
ci: emulate ppc64le on GHA (pypa#1211)
* ci: use GHA for ppc64le * fix(build): shell is sh, not bash, wrong syntax
1 parent 14ac00e commit 0689b92

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

.github/workflows/build.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,24 @@ on:
1414
- "docker/**"
1515
- "build.sh"
1616

17+
concurrency:
18+
group: test-${{ github.ref }}
19+
cancel-in-progress: true
20+
1721
jobs:
1822
build_manylinux:
1923
name: ${{ matrix.policy }}_${{ matrix.platform }}
2024
runs-on: ubuntu-20.04
2125
strategy:
2226
fail-fast: false
2327
matrix:
28+
policy: ["manylinux2014", "manylinux_2_24", "musllinux_1_1"]
29+
platform: ["i686", "x86_64", "ppc64le"]
2430
include:
2531
- policy: "manylinux2010"
2632
platform: "i686"
2733
- policy: "manylinux2010"
2834
platform: "x86_64"
29-
- policy: "manylinux2014"
30-
platform: "i686"
31-
- policy: "manylinux2014"
32-
platform: "x86_64"
33-
- policy: "manylinux_2_24"
34-
platform: "i686"
35-
- policy: "manylinux_2_24"
36-
platform: "x86_64"
37-
- policy: "musllinux_1_1"
38-
platform: "x86_64"
39-
- policy: "musllinux_1_1"
40-
platform: "i686"
4135

4236
env:
4337
POLICY: ${{ matrix.policy }}
@@ -48,6 +42,16 @@ jobs:
4842
- name: Checkout
4943
uses: actions/checkout@v2
5044

45+
- name: Set up emulation
46+
if: matrix.platform == 'ppc64le'
47+
uses: docker/setup-qemu-action@v1
48+
with:
49+
platforms: ${{ matrix.platform }}
50+
51+
# - name: Set BuildKit for ppc64le
52+
# if: matrix.platform == 'ppc64le'
53+
# run: echo 'MANYLINUX_BUILD_FRONTEND=buildkit' >> $GITHUB_ENV
54+
5155
- name: Set up Docker Buildx
5256
uses: docker/setup-buildx-action@v1
5357

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,18 @@ jobs:
2828
env: POLICY="manylinux2014" PLATFORM="aarch64"
2929
- arch: s390x
3030
env: POLICY="manylinux2014" PLATFORM="s390x"
31-
- arch: ppc64le
32-
env: POLICY="manylinux2014" PLATFORM="ppc64le" MANYLINUX_BUILD_FRONTEND="buildkit"
3331
- arch: arm64-graviton2
3432
virt: vm
3533
group: edge
3634
env: POLICY="manylinux_2_24" PLATFORM="aarch64"
3735
- arch: s390x
3836
env: POLICY="manylinux_2_24" PLATFORM="s390x"
39-
- arch: ppc64le
40-
env: POLICY="manylinux_2_24" PLATFORM="ppc64le" MANYLINUX_BUILD_FRONTEND="buildkit"
4137
- arch: arm64-graviton2
4238
virt: vm
4339
group: edge
4440
env: POLICY="musllinux_1_1" PLATFORM="aarch64"
4541
- arch: s390x
4642
env: POLICY="musllinux_1_1" PLATFORM="s390x"
47-
- arch: ppc64le
48-
env: POLICY="musllinux_1_1" PLATFORM="ppc64le" MANYLINUX_BUILD_FRONTEND="buildkit"
4943

5044
before_install:
5145
- if [ -d "${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM}" ]; then cp -rlf ${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM} ./; fi

docker/build_scripts/build-openssl.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ OPENSSL_MIN_VERSION=1.1.1
2020

2121
INSTALLED=$(openssl version | head -1 | awk '{ print $2 }')
2222
SMALLEST=$(echo -e "${INSTALLED}\n${OPENSSL_MIN_VERSION}" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | head -1)
23-
if [ "${SMALLEST}" == "${OPENSSL_MIN_VERSION}" ]; then
23+
24+
# Ignore letters in version numbers
25+
if [ "${SMALLEST}" = "${OPENSSL_MIN_VERSION}" ]; then
2426
echo "skipping installation of openssl ${OPENSSL_VERSION}, system provides openssl ${INSTALLED} which is newer than openssl ${OPENSSL_MIN_VERSION}"
2527
exit 0
2628
fi

0 commit comments

Comments
 (0)