From 9b3157b27db1ee744aaa3c619bf6f259f3c2ebce Mon Sep 17 00:00:00 2001 From: liyang Date: Tue, 4 Mar 2025 19:27:55 +0800 Subject: [PATCH] test dev builder --- .github/actions/build-dev-builder-images/action.yml | 4 ++-- Makefile | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-dev-builder-images/action.yml b/.github/actions/build-dev-builder-images/action.yml index 767f13cdde..01d0368f98 100644 --- a/.github/actions/build-dev-builder-images/action.yml +++ b/.github/actions/build-dev-builder-images/action.yml @@ -47,7 +47,7 @@ runs: run: | make dev-builder \ BASE_IMAGE=ubuntu \ - BUILDX_MULTI_PLATFORM_BUILD=amd64 \ + BUILDX_MULTI_PLATFORM_BUILD=arm64 \ IMAGE_REGISTRY=${{ inputs.dockerhub-image-registry }} \ IMAGE_NAMESPACE=${{ inputs.dockerhub-image-namespace }} \ DEV_BUILDER_IMAGE_TAG=${{ inputs.version }} @@ -69,8 +69,8 @@ runs: run: | make dev-builder \ BASE_IMAGE=android \ + BUILDX_MULTI_PLATFORM_BUILD=amd64 \ IMAGE_REGISTRY=${{ inputs.dockerhub-image-registry }} \ IMAGE_NAMESPACE=${{ inputs.dockerhub-image-namespace }} \ DEV_BUILDER_IMAGE_TAG=${{ inputs.version }} && \ - docker push ${{ inputs.dockerhub-image-registry }}/${{ inputs.dockerhub-image-namespace }}/dev-builder-android:${{ inputs.version }} diff --git a/Makefile b/Makefile index 98fd3db1be..27653093ca 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,8 @@ ifeq ($(BUILDX_MULTI_PLATFORM_BUILD), all) BUILDX_MULTI_PLATFORM_BUILD_OPTS := --platform linux/amd64,linux/arm64 --push else ifeq ($(BUILDX_MULTI_PLATFORM_BUILD), amd64) BUILDX_MULTI_PLATFORM_BUILD_OPTS := --platform linux/amd64 --push +else ifeq ($(BUILDX_MULTI_PLATFORM_BUILD), arm64) + BUILDX_MULTI_PLATFORM_BUILD_OPTS := --platform linux/arm64 --push else BUILDX_MULTI_PLATFORM_BUILD_OPTS := -o type=docker endif