From b924775df75f82f9dbf3c87ce91f68abe88e1342 Mon Sep 17 00:00:00 2001 From: pputman-clabs Date: Wed, 31 Jan 2024 14:06:46 -0600 Subject: [PATCH 1/3] update to workflow version 2.0 --- .github/workflows/blockscout.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/blockscout.yml b/.github/workflows/blockscout.yml index 2757e1f5fc69..726457357703 100644 --- a/.github/workflows/blockscout.yml +++ b/.github/workflows/blockscout.yml @@ -747,7 +747,7 @@ jobs: Build-Blockscout: - uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.8 + uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.0 needs: [set-docker-vars] with: workload-id-provider: ${{ needs.set-docker-vars.outputs.workload-id-provider }} @@ -763,7 +763,7 @@ jobs: Build-Blockscout-api: - uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.8 + uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.0 needs: [set-docker-vars] with: workload-id-provider: ${{ needs.set-docker-vars.outputs.workload-id-provider }} From dd37e14e3d03a53435d26a73e366ee228cb901ef Mon Sep 17 00:00:00 2001 From: pputman-clabs Date: Thu, 1 Feb 2024 09:30:34 -0600 Subject: [PATCH 2/3] changing tag to tags --- .github/workflows/blockscout.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/blockscout.yml b/.github/workflows/blockscout.yml index 726457357703..d528904a5ba8 100644 --- a/.github/workflows/blockscout.yml +++ b/.github/workflows/blockscout.yml @@ -753,7 +753,7 @@ jobs: workload-id-provider: ${{ needs.set-docker-vars.outputs.workload-id-provider }} service-account: ${{ needs.set-docker-vars.outputs.service-account }} artifact-registry: "${{ needs.set-docker-vars.outputs.artifact-registry }}/blockscout" - tag: ${{ needs.set-docker-vars.outputs.tag }} + tags: ${{ needs.set-docker-vars.outputs.tag }} context: . file: docker/Dockerfile build-args: | @@ -769,7 +769,7 @@ jobs: workload-id-provider: ${{ needs.set-docker-vars.outputs.workload-id-provider }} service-account: ${{ needs.set-docker-vars.outputs.service-account }} artifact-registry: "${{ needs.set-docker-vars.outputs.artifact-registry }}/blockscout-api" - tag: ${{ needs.set-docker-vars.outputs.tag }} + tags: ${{ needs.set-docker-vars.outputs.tag }} context: . file: docker/Dockerfile build-args: | From 1313397cd32802dea86852de82da3e7e348d1926 Mon Sep 17 00:00:00 2001 From: pputman-clabs Date: Thu, 1 Feb 2024 09:34:22 -0600 Subject: [PATCH 3/3] removing trivy timeout --- .github/workflows/blockscout.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/blockscout.yml b/.github/workflows/blockscout.yml index d528904a5ba8..5c304e4e0e70 100644 --- a/.github/workflows/blockscout.yml +++ b/.github/workflows/blockscout.yml @@ -759,7 +759,6 @@ jobs: build-args: | "FORCE_MIX_COMPILE_CACHE_MISS=${{ needs.set-docker-vars.outputs.sha }}" trivy: true - trivy-timeout: 20m Build-Blockscout-api: @@ -778,4 +777,3 @@ jobs: "DISABLE_INDEXER=true", "DISABLE_WEBAPP=true", trivy: true - trivy-timeout: 20m