From e17a1e992032b662d7793d150981e4439019272f Mon Sep 17 00:00:00 2001 From: appleboy Date: Sun, 6 Oct 2024 09:46:49 +0800 Subject: [PATCH] ci: streamline build process for multi-architecture support - Remove `build_linux_arm` target from Makefile - Remove `make build_linux_arm` step from Docker workflow - Update Docker workflow to build for `linux/amd64` and `linux/arm64` platforms only Signed-off-by: appleboy --- .github/workflows/docker.yml | 3 +-- Makefile | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4526c71..572639f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,7 +26,6 @@ jobs: - name: Build binary run: | make build_linux_amd64 - make build_linux_arm make build_linux_arm64 - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -64,7 +63,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - platforms: linux/amd64,linux/arm,linux/arm64 + platforms: linux/amd64,linux/arm64 file: docker/Dockerfile push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker-meta.outputs.tags }} diff --git a/Makefile b/Makefile index f371a72..a260503 100644 --- a/Makefile +++ b/Makefile @@ -89,9 +89,6 @@ build_linux_amd64: build_linux_arm64: CGO_ENABLED=0 GOOS=linux GOARCH=arm64 $(GO) build -a -tags '$(TAGS)' -ldflags '$(EXTLDFLAGS)-s -w $(LDFLAGS)' -o release/linux/arm64/$(DEPLOY_IMAGE) -build_linux_arm: - CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 $(GO) build -a -tags '$(TAGS)' -ldflags '$(EXTLDFLAGS)-s -w $(LDFLAGS)' -o release/linux/arm/$(DEPLOY_IMAGE) - .PHONY: deps-backend deps-backend: $(GO) mod download