From 607e5f0dbf2667a4e563a253396ddade368be4e8 Mon Sep 17 00:00:00 2001 From: ponkio-o <29038315+ponkio-o@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:49:25 +0900 Subject: [PATCH 1/5] chore: format Signed-off-by: ponkio-o <29038315+ponkio-o@users.noreply.github.com> --- .github/workflows/build_tool.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_tool.yaml b/.github/workflows/build_tool.yaml index 4a34a9a94f..fc15a5a362 100644 --- a/.github/workflows/build_tool.yaml +++ b/.github/workflows/build_tool.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: + image: - actions-gh-release - actions-plan-preview - codegen From 3fb5081291f2e45a384136bbf161e30763090928 Mon Sep 17 00:00:00 2001 From: ponkio-o <29038315+ponkio-o@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:50:33 +0900 Subject: [PATCH 2/5] chore: update action version Signed-off-by: ponkio-o <29038315+ponkio-o@users.noreply.github.com> --- .github/workflows/build_tool.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_tool.yaml b/.github/workflows/build_tool.yaml index fc15a5a362..591c0fa1ef 100644 --- a/.github/workflows/build_tool.yaml +++ b/.github/workflows/build_tool.yaml @@ -24,14 +24,14 @@ jobs: - piped-base-okd - firestore-emulator steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - name: Determine version run: echo "PIPECD_VERSION=$(git describe --tags --always --abbrev=7)" >> $GITHUB_ENV - name: Build ${{ matrix.image }} image - uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #v5.0.0 + uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0 with: context: tool/${{ matrix.image }} tags: ${{ env.REGISTRY }}/pipe-cd/${{ matrix.image }}:${{ env.PIPECD_VERSION }} From c758d97e4457fe5c414478615451689e2f64978e Mon Sep 17 00:00:00 2001 From: ponkio-o <29038315+ponkio-o@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:51:00 +0900 Subject: [PATCH 3/5] change: added linux/arm64 Signed-off-by: ponkio-o <29038315+ponkio-o@users.noreply.github.com> --- .github/workflows/build_tool.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_tool.yaml b/.github/workflows/build_tool.yaml index 591c0fa1ef..a151a6b707 100644 --- a/.github/workflows/build_tool.yaml +++ b/.github/workflows/build_tool.yaml @@ -35,3 +35,4 @@ jobs: with: context: tool/${{ matrix.image }} tags: ${{ env.REGISTRY }}/pipe-cd/${{ matrix.image }}:${{ env.PIPECD_VERSION }} + platforms: linux/amd64,linux/arm64 From 5fb809e21102a051df133270ee0f7f3351784f76 Mon Sep 17 00:00:00 2001 From: ponkio-o <29038315+ponkio-o@users.noreply.github.com> Date: Fri, 6 Dec 2024 21:10:40 +0900 Subject: [PATCH 4/5] change: use gcr.io/google.com/cloudsdktool/google-cloud-cli instead of google/clodu-sdk Signed-off-by: ponkio-o <29038315+ponkio-o@users.noreply.github.com> --- tool/firestore-emulator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/firestore-emulator/Dockerfile b/tool/firestore-emulator/Dockerfile index 1e29e7ea89..756ca4f7c2 100644 --- a/tool/firestore-emulator/Dockerfile +++ b/tool/firestore-emulator/Dockerfile @@ -1,6 +1,6 @@ ARG GOOGLE_CLOUD_SDK_VERSION=392.0.0-alpine -FROM google/cloud-sdk:$GOOGLE_CLOUD_SDK_VERSION +FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:$GOOGLE_CLOUD_SDK_VERSION RUN apk add --update --no-cache openjdk11-jre-headless From fb716cad7da9f7bf7258fcf293a739a9a133740b Mon Sep 17 00:00:00 2001 From: ponkio-o <29038315+ponkio-o@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:48:18 +0900 Subject: [PATCH 5/5] fix: add to setup build and qemu Signed-off-by: ponkio-o <29038315+ponkio-o@users.noreply.github.com> --- .github/workflows/build_tool.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build_tool.yaml b/.github/workflows/build_tool.yaml index a151a6b707..a29c7c23af 100644 --- a/.github/workflows/build_tool.yaml +++ b/.github/workflows/build_tool.yaml @@ -30,6 +30,10 @@ jobs: - name: Determine version run: echo "PIPECD_VERSION=$(git describe --tags --always --abbrev=7)" >> $GITHUB_ENV + - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 + + - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 + - name: Build ${{ matrix.image }} image uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0 with: