Merge pull request #259 from celo-org/pputman/udpate-ignore-files

updating ignore files

Author: pputman-clabs

.changeset/fifty-buses-taste.md

@@ -0,0 +1,2 @@
+---
+---

.dockerignore

@@ -11,3 +11,5 @@ npm-debug.log
 dockerfiles
 .vscode
 
+# Ignore generated credentials from google-github-actions/auth
+gha-creds-*.json

.github/workflows/odis-combiner-container.yml

@@ -20,43 +20,43 @@ on:
 
 jobs:
   odis-combiner-build-dev:
-    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.3
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.1
     name: Build us-west1-docker.pkg.dev/devopsre/dev-images/odis-combiner
     if: |
       github.ref != 'refs/heads/main'
     with:
       workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect/providers/github-by-repos
       service-account: 'social-connect-dev@devopsre.iam.gserviceaccount.com'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/odis-combiner
-      tag: ${{ github.sha }}
+      tags: ${{ github.sha }}
       context: .
       file: dockerfiles/Dockerfile-combiner
       trivy: true
 
   odis-combiner-build:
-    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.3
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.1
     name: Build us-west1-docker.pkg.dev/devopsre/social-connect/odis-combiner
     if: |
       github.ref == 'refs/heads/main'
     with:
       workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect-main/providers/github-by-repos
       service-account: 'social-connect@devopsre.iam.gserviceaccount.com'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/social-connect/odis-combiner
-      tag: ${{ github.sha }}
+      tags: ${{ github.sha }}
       context: .
       file: dockerfiles/Dockerfile-combiner
       trivy: true
 
   odis-combiner-tag:
-    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.3
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.1
     name: Build us-west1-docker.pkg.dev/devopsre/social-connect/odis-combiner tag
     if: |
       startsWith(github.ref, 'refs/tags/odis-combiner-')
     with:
       workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect-tag/providers/github-by-repos
       service-account: 'social-connect@devopsre.iam.gserviceaccount.com'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/social-connect/odis-combiner
-      tag: ${{ github.ref_name }}
+      tags: ${{ github.ref_name }}
       context: .
       file: dockerfiles/phone-number-privacy/Dockerfile-combiner
       trivy: true

.github/workflows/odis-loadtest-container.yml

@@ -20,43 +20,43 @@ on:
 
 jobs:
   odis-loadtest-build-dev:
-    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.3
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.1
     name: Build us-west1-docker.pkg.dev/devopsre/dev-images/odis-loadtest
     if: |
       github.ref != 'refs/heads/main'
     with:
       workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect/providers/github-by-repos
       service-account: 'social-connect-dev@devopsre.iam.gserviceaccount.com'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/odis-loadtest
-      tag: ${{ github.sha }}
+      tags: ${{ github.sha }}
       context: .
       file: dockerfiles/Dockerfile-loadtest
       trivy: true
 
   odis-loadtest-build:
-    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.3
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.1
     name: Build us-west1-docker.pkg.dev/devopsre/social-connect/odis-loadtest
     if: |
       github.ref == 'refs/heads/main'
     with:
       workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect-main/providers/github-by-repos
       service-account: 'social-connect@devopsre.iam.gserviceaccount.com'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/social-connect/odis-loadtest
-      tag: ${{ github.sha }}
+      tags: ${{ github.sha }}
       context: .
       file: dockerfiles/Dockerfile-loadtest
       trivy: true
 
   odis-loadtest-tag:
-    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.3
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.1
     name: Build us-west1-docker.pkg.dev/devopsre/social-connect/odis-loadtest tag
     if: |
       startsWith(github.ref, 'refs/tags/odis-loadtest-')
     with:
       workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect-tag/providers/github-by-repos
       service-account: 'social-connect@devopsre.iam.gserviceaccount.com'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/social-connect/odis-loadtest
-      tag: ${{ github.ref_name }}
+      tags: ${{ github.ref_name }}
       context: .
       file: dockerfiles/phone-number-privacy/Dockerfile-loadtest
       trivy: true

.github/workflows/odis-signer-container.yml

@@ -20,43 +20,43 @@ on:
 
 jobs:
   odis-signer-build-dev:
-    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.3
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.1
     name: Build us-west1-docker.pkg.dev/devopsre/dev-images/odis-signer
     if: |
       github.ref != 'refs/heads/main'
     with:
       workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect/providers/github-by-repos
       service-account: 'social-connect-dev@devopsre.iam.gserviceaccount.com'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/odis-signer
-      tag: ${{ github.sha }}
+      tags: ${{ github.sha }}
       context: .
       file: dockerfiles/Dockerfile-signer
       trivy: true
 
   odis-signer-build:
-    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.3
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.1
     name: Build us-west1-docker.pkg.dev/devopsre/social-connect/odis-signer
     if: |
       github.ref == 'refs/heads/main'
     with:
       workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect-main/providers/github-by-repos
       service-account: 'social-connect@devopsre.iam.gserviceaccount.com'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/social-connect/odis-signer
-      tag: ${{ github.sha }}
+      tags: ${{ github.sha }}
       context: .
       file: dockerfiles/Dockerfile-signer
       trivy: true
 
   odis-signer-tag:
-    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.3
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.1
     name: Build us-west1-docker.pkg.dev/devopsre/social-connect/odis-signer tag
     if: |
       startsWith(github.ref, 'refs/tags/odis-signer-')
     with:
       workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect-tag/providers/github-by-repos
       service-account: 'social-connect@devopsre.iam.gserviceaccount.com'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/social-connect/odis-signer
-      tag: ${{ github.ref_name }}
+      tags: ${{ github.ref_name }}
       context: .
       file: dockerfiles/phone-number-privacy/Dockerfile-signer
       trivy: true

.gitignore

@@ -116,3 +116,6 @@ packages/protocol/types/typechain-mento/*.d.ts
 tmp
 docs/examples/lib
 packages/odis-identifiers/lib
+
+# Ignore generated credentials from google-github-actions/auth
+gha-creds-*.json