Specify the platform to use for CI containers

inko-lang · Jan 17, 2025 · 7f42d45 · 7f42d45
1 parent d90ade5
commit 7f42d45
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/runtimes.yml b/.github/workflows/runtimes.yml
@@ -14,22 +14,23 @@ jobs:
       matrix:
         target:
           - image: ci:debian
-            name: amd64-linux
+            arch: amd64
             runner: ubuntu-24.04
           - image: ci:debian
-            name: arm64-linux
+            arch: arm64
             runner: ubuntu-24.04-arm
-    name: ${{ matrix.target.name }}
+    name: ${{ matrix.target.arch }}-linux
     runs-on: ${{ matrix.target.runner }}
     container:
       image: ghcr.io/inko-lang/${{ matrix.target.image }}
+      options: '--platform=linux/${{ matrix.arch }}'
     steps:
       - uses: actions/checkout@v4
       - name: Build runtimes
-        run: bash ci/runtimes.sh ${{ matrix.target.name }}
+        run: bash ci/runtimes.sh ${{ matrix.target.arch }}-linux
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.target.name }}
+          name: ${{ matrix.target.arch }}-linux
           path: tmp/runtimes/*.tar.gz
           overwrite: true
           retention-days: 2

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -69,21 +69,26 @@ jobs:
         target:
           - image: ci:debian
             name: amd64-linux-gnu
+            platform: linux/amd64
             runner: ubuntu-24.04
           - image: ci:debian
             name: arm64-linux-gnu
+            platform: linux/arm64
             runner: ubuntu-24.04-arm
           - image: ci:alpine
             name: amd64-linux-musl
+            platform: linux/amd64
             runner: ubuntu-24.04
           - image: ci:alpine
             name: arm64-linux-musl
+            platform: linux/arm64
             runner: ubuntu-24.04-arm
     name: ${{ matrix.target.name }} compiler
     timeout-minutes: 15
     runs-on: ${{ matrix.target.runner }}
     container:
       image: ghcr.io/inko-lang/${{ matrix.target.image }}
+      options: '--platform=${{ matrix.target.platform }}'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
@@ -103,21 +108,26 @@ jobs:
         target:
           - image: ci:debian
             name: amd64-linux-gnu
+            platform: linux/amd64
             runner: ubuntu-24.04
           - image: ci:alpine
             name: amd64-linux-musl
+            platform: linux/amd64
             runner: ubuntu-24.04
           - image: ci:debian
             name: arm64-linux-gnu
+            platform: linux/arm64
             runner: ubuntu-24.04-arm
           - image: ci:alpine
             name: arm64-linux-musl
+            platform: linux/arm64
             runner: ubuntu-24.04-arm
     name: ${{ matrix.target.name }} std --opt=${{ matrix.level }}
     timeout-minutes: 15
     runs-on: ${{ matrix.target.runner }}
     container:
       image: ghcr.io/inko-lang/${{ matrix.target.image }}
+      options: '--platform=${{ matrix.target.platform }}'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4