ci: Fix job ignored when squased from PR branch

snorremd · Oct 8, 2023 · bb34fac · bb34fac
1 parent b7b6208
commit bb34fac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -20,19 +20,8 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: "1.21.1"
-      - 
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+
       -
-        name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          distribution: goreleaser
-          version: latest
-          args: release --clean --snapshot
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        name: Check that go build works
+        run: |
+          go build -o norsky
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -4,6 +4,8 @@ on:
   push:
     tags:
       - v*
+    branches-ignore:
+      - '**'
 
 permissions:
   contents: write
@@ -12,7 +14,6 @@ permissions:
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
     steps:
       -
         name: Checkout
@@ -24,12 +25,12 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: "1.21.1"
-      
+
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - 
-        
+      -
+
         name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
@@ -44,4 +45,4 @@ jobs:
           version: latest
           args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}