ci: set correct arch for rootfs tests
authorPaul Spooren <mail@aparcar.org>
Thu, 14 Mar 2024 13:46:15 +0000 (14:46 +0100)
committerJosef Schlehofer <pepe.schlehofer@gmail.com>
Mon, 29 Apr 2024 14:31:38 +0000 (16:31 +0200)
With the commit 01e5cfc "CI: Add target/arch tags (no suffix) for
snapshot images"[1] the os/platform is set for all images, which is usually
different from what the GitHub action runner uses (x86). The Docker
deamon still tries to fetch the x86 version and fails.

This commit explicitly sets the fitting arch.

[1]: https://github.com/openwrt/docker/commit/01e5cfccd73a72ecab730496607c7c22b904f366

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit d359fa04eda29638b9326c194490685c1177fd49)

.github/workflows/multi-arch-test-build.yml

index 87ed8f4f48306a834bcfb6f45c6f52f8f20863a5..da2eee3338aaa74a3ec82011b99072467fda6511 100644 (file)
@@ -158,11 +158,11 @@ jobs:
       - name: Build Docker container
         if: ${{ matrix.runtime_test }}
         run: |
-          docker build -t test-container --build-arg ARCH .github/workflows/
+          docker build --platform linux/${{ matrix.arch }} -t test-container --build-arg ARCH .github/workflows/
         env:
           ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
 
       - name: Test via Docker container
         if: ${{ matrix.runtime_test }}
         run: |
-          docker run --rm -v $GITHUB_WORKSPACE:/ci test-container
+          docker run --platform linux/${{ matrix.arch }} --rm -v $GITHUB_WORKSPACE:/ci test-container