From 05ea523ef24c1ee22cafd69e7a03951ebd1a6afe Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Fri, 22 Nov 2024 15:14:49 +0900 Subject: [PATCH 1/3] use qemu Signed-off-by: Yutaka Kondo --- .github/workflows/docker-build-and-push-arm64.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml index e6da14db8b..6f7787c2cb 100644 --- a/.github/workflows/docker-build-and-push-arm64.yaml +++ b/.github/workflows/docker-build-and-push-arm64.yaml @@ -13,7 +13,7 @@ jobs: docker-build-and-push: needs: load-env - runs-on: buildjet-16vcpu-ubuntu-2204-arm + runs-on: buildjet-16vcpu-ubuntu-2204 steps: - name: Check if PR author is the specific user id: author-check @@ -36,6 +36,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Get changed files id: changed-files uses: tj-actions/changed-files@v45 @@ -74,7 +77,7 @@ jobs: docker-build-and-push-cuda: needs: [load-env, docker-build-and-push] - runs-on: buildjet-16vcpu-ubuntu-2204-arm + runs-on: buildjet-16vcpu-ubuntu-2204 steps: - name: Check out repository uses: actions/checkout@v4 @@ -84,6 +87,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Get changed files id: changed-files uses: tj-actions/changed-files@v45 From 73041d4b2a7fb046043a6a48c5adf6956625f85a Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Fri, 22 Nov 2024 15:16:40 +0900 Subject: [PATCH 2/3] MUST REVERT Signed-off-by: Yutaka Kondo --- .github/workflows/docker-build-and-push-arm64.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml index 6f7787c2cb..c7663e35ff 100644 --- a/.github/workflows/docker-build-and-push-arm64.yaml +++ b/.github/workflows/docker-build-and-push-arm64.yaml @@ -1,6 +1,7 @@ name: docker-build-and-push-arm64 on: + pull_request: push: branches: - main From 1274067c3d3665a2b47f9e2e6d2f1a8808b6d7bd Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Fri, 22 Nov 2024 15:33:28 +0900 Subject: [PATCH 3/3] MUST REVERT Signed-off-by: Yutaka Kondo --- .github/workflows/docker-build-and-push-arm64.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml index c7663e35ff..7eb802d417 100644 --- a/.github/workflows/docker-build-and-push-arm64.yaml +++ b/.github/workflows/docker-build-and-push-arm64.yaml @@ -67,9 +67,6 @@ jobs: *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }} *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }} *.args.LIB_DIR=aarch64 - *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }} - *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-main - *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max - name: Show disk space if: always() @@ -117,9 +114,6 @@ jobs: *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }} *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }} *.args.LIB_DIR=aarch64 - *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }} - *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-main - *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max - name: Show disk space if: always()