From b8f9d1a2b71686bbdb4a1e4f6d1823348fa30783 Mon Sep 17 00:00:00 2001 From: MaxymVlasov Date: Fri, 23 Feb 2024 23:21:59 +0200 Subject: [PATCH 1/5] fix: Add tests for arm64 and for macOS --- .github/workflows/build-image-test.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml index 1b263ce46..a111f5f2c 100644 --- a/.github/workflows/build-image-test.yaml +++ b/.github/workflows/build-image-test.yaml @@ -7,7 +7,12 @@ env: jobs: build: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + arch: [amd64, arm64] + + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: From 51116cb2fabf58e3194adb99d2e396791bb2429c Mon Sep 17 00:00:00 2001 From: MaxymVlasov Date: Fri, 23 Feb 2024 23:31:56 +0200 Subject: [PATCH 2/5] fix issues with docker on macos arm --- .github/workflows/build-image-test.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml index a111f5f2c..47a1d4e73 100644 --- a/.github/workflows/build-image-test.yaml +++ b/.github/workflows/build-image-test.yaml @@ -28,6 +28,13 @@ jobs: tools/entrypoint.sh .github/workflows/build-image-test.yaml + - name: Setup docker (missing on MacOS) + if: runner.os == 'macos' + run: | + brew install docker + colima start + + - name: Set up Docker Buildx uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0 From df7d5868b45a1954b110984941e11a66b75c4315 Mon Sep 17 00:00:00 2001 From: MaxymVlasov Date: Fri, 23 Feb 2024 23:39:12 +0200 Subject: [PATCH 3/5] Build multiarch only in ubuntu amd64 --- .github/workflows/build-image-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml index 47a1d4e73..61930fb19 100644 --- a/.github/workflows/build-image-test.yaml +++ b/.github/workflows/build-image-test.yaml @@ -73,7 +73,7 @@ jobs: # Can't build both platforms and use --load at the same time # https://github.com/docker/buildx/issues/59#issuecomment-1433097926 - name: Build Multi-arch docker-image - if: steps.changed-files-specific.outputs.any_changed == 'true' + if: steps.changed-files-specific.outputs.any_changed == 'true' && runner.os == 'ubuntu' && matrix.arch == 'amd64' uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0 with: context: . From 5583e992c3f141a2436106fdfc958731ffee86d2 Mon Sep 17 00:00:00 2001 From: MaxymVlasov Date: Fri, 23 Feb 2024 23:45:32 +0200 Subject: [PATCH 4/5] f --- .github/workflows/build-image-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml index 61930fb19..9a53bf978 100644 --- a/.github/workflows/build-image-test.yaml +++ b/.github/workflows/build-image-test.yaml @@ -73,7 +73,7 @@ jobs: # Can't build both platforms and use --load at the same time # https://github.com/docker/buildx/issues/59#issuecomment-1433097926 - name: Build Multi-arch docker-image - if: steps.changed-files-specific.outputs.any_changed == 'true' && runner.os == 'ubuntu' && matrix.arch == 'amd64' + if: steps.changed-files-specific.outputs.any_changed == 'true' && matrix.os == 'ubuntu-latest' && matrix.arch == 'amd64' uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0 with: context: . From 7897b2c34b884c87bc1cca379176d39d30ea4b49 Mon Sep 17 00:00:00 2001 From: MaxymVlasov Date: Mon, 26 Feb 2024 16:32:30 +0200 Subject: [PATCH 5/5] ci: Add tests for arm64 --- .github/workflows/build-image-test.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml index 9a53bf978..9dfbda3c6 100644 --- a/.github/workflows/build-image-test.yaml +++ b/.github/workflows/build-image-test.yaml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest] arch: [amd64, arm64] runs-on: ${{ matrix.os }} @@ -28,13 +28,6 @@ jobs: tools/entrypoint.sh .github/workflows/build-image-test.yaml - - name: Setup docker (missing on MacOS) - if: runner.os == 'macos' - run: | - brew install docker - colima start - - - name: Set up Docker Buildx uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0