Try multiarch builds

karellen · Sep 10, 2024 · 323cc9d · 323cc9d
1 parent 74cd7b4
commit 323cc9d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,6 +12,7 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
@@ -29,10 +30,12 @@ jobs:
       fail-fast: false
       matrix:
         policy: ["manylinux2014", "musllinux_1_1", "musllinux_1_2"]
-        platform: ["i686", "x86_64"]
+        platform: ["i686", "x86_64", "aarch64", "ppc64le", "s390x"]
         include:
           - policy: "manylinux_2_28"
             platform: "x86_64"
+          - policy: "manylinux_2_28"
+            platform: "aarch64"
 
     env:
       POLICY: ${{ matrix.policy }}

diff --git a/build.yml.patch b/build.yml.patch
@@ -1,8 +1,8 @@
-diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
-index 7364c19..0ab1ce1 100644
---- a/.github/workflows/build.yml
-+++ b/.github/workflows/build.yml
-@@ -9,20 +9,9 @@ on:
+diff --git b/.github/workflows/build.yml a/.github/workflows/build.yml
+index 7364c19..319e734 100644
+--- b/.github/workflows/build.yml
++++ a/.github/workflows/build.yml
+@@ -9,19 +9,9 @@ on:
          required: false
          default: true
    push:
@@ -20,12 +20,11 @@ index 7364c19..0ab1ce1 100644
 -      - "docker/**"
 -      - "tests/**"
 -      - "*.sh"
--
 +    branches: [master]
+
  concurrency:
    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
-   cancel-in-progress: true
-@@ -33,6 +22,9 @@ jobs:
+@@ -33,14 +23,19 @@ jobs:
      runs-on: ubuntu-22.04
      permissions:
        actions: write # this permission is needed to delete cache
@@ -35,7 +34,18 @@ index 7364c19..0ab1ce1 100644
      strategy:
        fail-fast: false
        matrix:
-@@ -52,6 +44,12 @@ jobs:
+         policy: ["manylinux2014", "musllinux_1_1", "musllinux_1_2"]
+-        platform: ["i686", "x86_64"]
++        platform: ["i686", "x86_64", "aarch64", "ppc64le", "s390x"]
+         include:
+           - policy: "manylinux_2_28"
+             platform: "x86_64"
++          - policy: "manylinux_2_28"
++            platform: "aarch64"
+
+     env:
+       POLICY: ${{ matrix.policy }}
+@@ -52,6 +47,12 @@ jobs:
          uses: actions/checkout@v4
          with:
            fetch-depth: 50
@@ -48,7 +58,7 @@ index 7364c19..0ab1ce1 100644
 
        - name: Set up emulation
          if: matrix.platform != 'i686' && matrix.platform != 'x86_64'
-@@ -66,33 +64,38 @@ jobs:
+@@ -66,33 +67,38 @@ jobs:
          if: github.event_name != 'workflow_dispatch' || fromJSON(github.event.inputs.useCache)
          uses: actions/cache/restore@v4
          with:

diff --git a/patch_build_yml.sh b/patch_build_yml.sh
@@ -1,5 +1,9 @@
 #!/bin/bash -eEu
 
+pushd manylinux
+git restore .github/workflows/build.yml
+popd
+
 cp manylinux/.github/workflows/build.yml .github/workflows/build.yml
 patch -p1 < build.yml.patch