Fixed merge conflict

covalenthq · Mar 19, 2024 · 8834306 · 8834306
1 parent 51eb7e8
commit 8834306
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -1,4 +1,4 @@
-name: docker-image-ci
+name: docker-image
 
 on:
   push:
@@ -22,20 +22,12 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-#      - name: Login to GCR
-#        if: ${{ !env.ACT }}
-#        uses: docker/login-action@v3
-#        with:
-#          registry: gcr.io
-#          username: _json_key
-#          password: ${{ secrets.GCR_JSON_KEY }}
       - name: Checkout
         uses: actions/checkout@v2
       - name: Extract metadata for the Docker image
         id: meta
         uses: docker/metadata-action@v4
         with:
-#          images: ghcr.io/${{ github.repository }},gcr.io/covalent-project/bsp-geth
           images: ghcr.io/${{ github.repository }}
           tags: |
             type=ref,event=branch
@@ -51,6 +43,8 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
       - name: Create release
         uses: marvinpinto/action-automatic-releases@919008cf3f741b179569b7a6fb4d8860689ab7f0 # v1.2.1
         if: startsWith(github.ref, 'refs/tags/')