From 2cf00518282eac2572c4fac7dc67c3f08a0a20a0 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Fri, 22 Nov 2024 10:28:25 +0900 Subject: [PATCH 1/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 7ec7c92e5a..78b0319cfd 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 ceb38d28e921084fce62f7ffbac2ccf788dd2175 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Fri, 22 Nov 2024 10:32:11 +0900 Subject: [PATCH 2/3] change to 16vcpu Signed-off-by: Yutaka Kondo --- .github/workflows/docker-build-and-push-arm64.yaml | 2 +- .github/workflows/health-check-arm64.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml index 78b0319cfd..dac5ce0a1b 100644 --- a/.github/workflows/docker-build-and-push-arm64.yaml +++ b/.github/workflows/docker-build-and-push-arm64.yaml @@ -14,7 +14,7 @@ jobs: docker-build-and-push: needs: load-env - runs-on: buildjet-8vcpu-ubuntu-2204-arm + runs-on: buildjet-16vcpu-ubuntu-2204-arm steps: - name: Check if PR author is the specific user id: author-check diff --git a/.github/workflows/health-check-arm64.yaml b/.github/workflows/health-check-arm64.yaml index cabcd249d0..00905ab7c4 100644 --- a/.github/workflows/health-check-arm64.yaml +++ b/.github/workflows/health-check-arm64.yaml @@ -11,7 +11,7 @@ jobs: docker-build: needs: load-env - runs-on: buildjet-8vcpu-ubuntu-2204-arm + runs-on: buildjet-16vcpu-ubuntu-2204-arm steps: # https://github.com/actions/checkout/issues/211 - name: Change permission of workspace From f74b21a2e4d370fe958bc57e8b1d55d4e3bdb4a3 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Fri, 22 Nov 2024 10:52:34 +0900 Subject: [PATCH 3/3] remove cache-from/to 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 dac5ce0a1b..decd3a10f2 100644 --- a/.github/workflows/docker-build-and-push-arm64.yaml +++ b/.github/workflows/docker-build-and-push-arm64.yaml @@ -64,9 +64,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=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }} - *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-main - *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }} - name: Show disk space @@ -112,9 +109,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=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }} - *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-main - *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }} - name: Show disk space