Update workflows for api-dings and debug-dings

nais · Oct 16, 2023 · a44596c · a44596c
1 parent d87176c
commit a44596c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/apidings-ci.yaml b/.github/workflows/apidings-ci.yaml
@@ -2,10 +2,9 @@ name: api-dings main
 
 on:
   push:
-    branches:
-      - main
     paths:
-      - 'api-dings/**'
+      - .github/workflows/apidings-ci.yaml
+      - api-dings/**
 
 env:
   IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
@@ -17,7 +16,6 @@ defaults:
 jobs:
   build:
     name: Build and push Docker container
-    if: "github.ref == 'refs/heads/main'"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout latest code
@@ -49,13 +47,19 @@ jobs:
 
       - name: Login to GitHub Docker Registry
         uses: docker/login-action@v1
+        if: "github.ref == 'refs/heads/main'"
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build an push the Docker image
+
+      - name: Build Docker image
         run: |
           docker build --pull --tag ${IMAGE} .
+
+      - name: Push Docker image
+        if: "github.ref == 'refs/heads/main'"
+        run: |
           docker push ${IMAGE}
 
   deploy-dev-gcp:

diff --git a/.github/workflows/debugdings-ci.yaml b/.github/workflows/debugdings-ci.yaml
@@ -47,23 +47,31 @@ jobs:
 
       - name: Login to GitHub Docker Registry
         uses: docker/login-action@v1
+        if: "github.ref == 'refs/heads/main'"
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build an push the Docker image
+
+      - name: Build Docker image
         run: |
           docker build --pull --tag ${IMAGE} .
+
+      - name: Push Docker image
+        if: "github.ref == 'refs/heads/main'"
+        run: |
           docker push ${IMAGE}
 
       - name: 'Authenticate to Google Cloud'
         id: 'google'
         uses: 'google-github-actions/auth@v1'
+        if: "github.ref == 'refs/heads/main'"
         with:
           credentials_json: ${{ secrets.SALSA_CREDENTIALS }}
 
       - name: NAIS SLSA Provenance Action
         uses: nais/salsa-action@v0.0.1-beta
+        if: "github.ref == 'refs/heads/main'"
         with:
           ecosystem: 'gradle'
           image: ${{ env.IMAGE }}