Fix docker workflows not working

transprogrammer · Aug 14, 2024 · 0bbb7dd · 0bbb7dd
1 parent 1660cac
commit 0bbb7dd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -3,12 +3,15 @@ name: Docker
 on:
   push:
     branches: [main]
-    tags:
-      - 'v*'
+    tags: ["v*"]
 
 jobs:
   Build-and-Push:
     runs-on: ubuntu-latest
+
+    # We want to filter out dependabot and pre-commit
+    # automated pushes to main
+    if: ${{ github.actor != 'dependabot[bot]'}} && ${{ github.actor != 'pre-commit-ci[bot]'}}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -44,7 +47,6 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rodhaj:bot-build-cache
-          cache-to: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/rodhaj:bot-build-cache
-          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rodhaj-build-cache:bot
+          cache-to: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/rodhaj-build-cache:bot
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,11 +31,8 @@ jobs:
 
 
   Release:
-    permissions:
-      contents: write
-    needs: Bundle
-
     runs-on: ubuntu-latest
+    needs: Bundle
     if: contains(github.event.head_commit.message, '#major') || contains(github.event.head_commit.message, '#minor') || contains(github.event.head_commit.message, '#patch')
     steps:
     - uses: actions/checkout@v4
@@ -52,7 +49,7 @@ jobs:
       uses: anothrNick/[email protected]
       id: tag_version
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
         WITH_V: true
         RELEASE_BRANCHES: main