From 2b5e5d233e2b00b25ec0e911f329b140b1ddb4a4 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Tue, 19 Mar 2024 16:05:37 +0100 Subject: [PATCH] Fix merge --- .../workflows/build-sign-commit-images.yaml | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/.github/workflows/build-sign-commit-images.yaml b/.github/workflows/build-sign-commit-images.yaml index 5ec2a20cd9..f56a00ea95 100644 --- a/.github/workflows/build-sign-commit-images.yaml +++ b/.github/workflows/build-sign-commit-images.yaml @@ -16,35 +16,20 @@ jobs: steps: - uses: actions/checkout@v4 - name: Login at GCP Artifact Registry -<<<<<<< HEAD - # v2.0 is main at feb 1 2023 - uses: celo-org/reusable-workflows/.github/actions/auth-gcp-artifact-registry@v2.0 -======= - # v2.0.1 is main at Oct 26, 2023 uses: celo-org/reusable-workflows/.github/actions/auth-gcp-artifact-registry@v2.0.1 ->>>>>>> 74c5f920c (Refactor container workflows) with: workload-id-provider: 'projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-blockchain-dev/providers/github-by-repos' service-account: 'celo-blockchain-dev@devopsre.iam.gserviceaccount.com' docker-gcp-registries: us-west1-docker.pkg.dev - name: Build and push container -<<<<<<< HEAD - uses: celo-org/reusable-workflows/.github/actions/build-container@v2.0 -======= uses: celo-org/reusable-workflows/.github/actions/build-container@v2.0.1 ->>>>>>> 74c5f920c (Refactor container workflows) with: platforms: linux/amd64,linux/arm64 registry: us-west1-docker.pkg.dev/devopsre/dev-images/geth tags: ${{ github.sha }} context: . dockerfile: Dockerfile -<<<<<<< HEAD - push: ${{ fromJSON(true) }} - trivy: ${{ fromJSON(true) }} -======= push: true ->>>>>>> 74c5f920c (Refactor container workflows) build-container-geth-all: runs-on: [self-hosted, blockchain, 8-cpu] @@ -55,53 +40,12 @@ jobs: steps: - uses: actions/checkout@v4 - name: Login at GCP Artifact Registry -<<<<<<< HEAD - uses: celo-org/reusable-workflows/.github/actions/auth-gcp-artifact-registry@v2.0 -======= uses: celo-org/reusable-workflows/.github/actions/auth-gcp-artifact-registry@v2.0.1 ->>>>>>> 74c5f920c (Refactor container workflows) with: workload-id-provider: 'projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-blockchain/providers/github-by-repos' service-account: 'celo-blockchain-dev@devopsre.iam.gserviceaccount.com' docker-gcp-registries: us-west1-docker.pkg.dev - name: Build and push container -<<<<<<< HEAD - uses: celo-org/reusable-workflows/.github/actions/build-container@v2.0 - with: - platforms: linux/amd64,linux/arm64 - registry: us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/geth - tags: master - context: . - dockerfile: Dockerfile - push: ${{ fromJSON(true) }} - trivy: ${{ fromJSON(true) }} - - build-container-geth-all-master: - runs-on: [self-hosted, blockchain, 8-cpu] - if: github.ref == 'refs/heads/master' - permissions: - contents: read - id-token: write - security-events: write - steps: - - uses: actions/checkout@v4 - - name: Login at GCP Artifact Registry - uses: celo-org/reusable-workflows/.github/actions/auth-gcp-artifact-registry@v2.0 - with: - workload-id-provider: 'projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-blockchain/providers/github-by-repos' - service-account: 'celo-blockchain@devopsre.iam.gserviceaccount.com' - docker-gcp-registries: us-west1-docker.pkg.dev - - name: Build and push container - uses: celo-org/reusable-workflows/.github/actions/build-container@v2.0 - with: - platforms: linux/amd64,linux/arm64 - registry: us-west1-docker.pkg.dev/devopsre/celo-blockchain-public/geth-all - tags: master - context: . - dockerfile: Dockerfile.alltools - push: ${{ fromJSON(true) }} - trivy: ${{ fromJSON(true) }} -======= uses: celo-org/reusable-workflows/.github/actions/build-container@v2.0.1 with: platforms: linux/amd64,linux/arm64 @@ -111,7 +55,6 @@ jobs: dockerfile: Dockerfile.alltools push: true - add-geth-master-tag: if: github.ref == 'refs/heads/master' uses: ./.github/workflows/add-docker-tag.yaml @@ -129,4 +72,3 @@ jobs: with: source-image: us-west1-docker.pkg.dev/devopsre/dev-images/geth-all:${{ github.sha }} destination-image: us-west1-docker.pkg.dev/devopsre/dev-images/geth:master ->>>>>>> 74c5f920c (Refactor container workflows)