From 443d364366bc1a5661ce6ce89eb19d0ac7c4118c Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Wed, 12 Jun 2024 09:36:01 +0900 Subject: [PATCH] refactor(ci): use `matrix.platform` to `tag-suffix` (#4853) use matrix.platform Signed-off-by: Yutaka Kondo --- .github/workflows/build-main-self-hosted.yaml | 2 +- .github/workflows/build-main.yaml | 2 +- .github/workflows/docker-build-and-push-main-self-hosted.yaml | 2 +- .github/workflows/docker-build-and-push-main.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-main-self-hosted.yaml b/.github/workflows/build-main-self-hosted.yaml index f6cc66a5ebd..73354230d98 100644 --- a/.github/workflows/build-main-self-hosted.yaml +++ b/.github/workflows/build-main-self-hosted.yaml @@ -66,7 +66,7 @@ jobs: *.args.LIB_DIR=${{ matrix.lib_dir }} *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-main *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-main,mode=max - tag-suffix: ${{ matrix.additional-tag-suffix }}-arm64 + tag-suffix: ${{ matrix.additional-tag-suffix }}-${{ matrix.platform }} tag-prefix: ${{ needs.load-env.outputs.rosdistro }} allow-push: false diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml index 0e382eba987..859c754c169 100644 --- a/.github/workflows/build-main.yaml +++ b/.github/workflows/build-main.yaml @@ -61,7 +61,7 @@ jobs: *.args.LIB_DIR=${{ matrix.lib_dir }} *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-main *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-main,mode=max - tag-suffix: ${{ matrix.additional-tag-suffix }}-amd64 + tag-suffix: ${{ matrix.additional-tag-suffix }}-${{ matrix.platform }} tag-prefix: ${{ needs.load-env.outputs.rosdistro }} allow-push: false diff --git a/.github/workflows/docker-build-and-push-main-self-hosted.yaml b/.github/workflows/docker-build-and-push-main-self-hosted.yaml index 7c3832e14db..0d44a72ed30 100644 --- a/.github/workflows/docker-build-and-push-main-self-hosted.yaml +++ b/.github/workflows/docker-build-and-push-main-self-hosted.yaml @@ -79,7 +79,7 @@ jobs: *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-${{ github.ref_name }} *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-main *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-${{ github.ref_name }},mode=max - tag-suffix: ${{ matrix.additional-tag-suffix }}-arm64 + tag-suffix: ${{ matrix.additional-tag-suffix }}-${{ matrix.platform }} tag-prefix: ${{ needs.load-env.outputs.rosdistro }} allow-push: true diff --git a/.github/workflows/docker-build-and-push-main.yaml b/.github/workflows/docker-build-and-push-main.yaml index bb2e1e42dff..c0267f95ba4 100644 --- a/.github/workflows/docker-build-and-push-main.yaml +++ b/.github/workflows/docker-build-and-push-main.yaml @@ -74,7 +74,7 @@ jobs: *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-${{ github.ref_name }} *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-main *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-${{ github.ref_name }},mode=max - tag-suffix: ${{ matrix.additional-tag-suffix }}-amd64 + tag-suffix: ${{ matrix.additional-tag-suffix }}-${{ matrix.platform }} tag-prefix: ${{ needs.load-env.outputs.rosdistro }} allow-push: true