From b7bbd301752633d0cf5bb1cdcd2a9ff33ac228e3 Mon Sep 17 00:00:00 2001 From: Chingis Sandanov Date: Thu, 30 May 2024 19:02:14 +0300 Subject: [PATCH] Revert "Test multi-arch build with --load" This reverts commit 24ae47962d52fb3ef57a42aa1445e74bbf1ac3cb. --- .github/actions/action.yml | 3 ++- .github/workflows/workflow.yml | 1 - Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/action.yml b/.github/actions/action.yml index 474608d..a6f5384 100644 --- a/.github/actions/action.yml +++ b/.github/actions/action.yml @@ -33,7 +33,8 @@ runs: PLATFORM: ${{ inputs.platform }} run: | set -e - make buildx-build + make buildx-build-amd64 make test + make buildx-build . $GITHUB_ACTION_PATH/release.sh shell: bash diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 8fb83d7..491bb12 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -16,7 +16,6 @@ env: RUBY31: '3.1.6' DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - DOCKER_CLI_EXPERIMENTAL: enabled jobs: ruby33: diff --git a/Makefile b/Makefile index b83a420..a324ed8 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ buildx-build: ./ buildx-push: - docker buildx build --load --platform $(PLATFORM) --push -t $(REPO):$(TAG) \ + docker buildx build --platform $(PLATFORM) --push -t $(REPO):$(TAG) \ --build-arg RUBY_VER=$(RUBY_VER) \ --build-arg RUBY_DEV=$(RUBY_DEV) \ --build-arg WODBY_GROUP_ID=$(WODBY_GROUP_ID) \