- Flere conditionals på draft PR.

- Normaliserer format på RESOURCE pga. irriterende bug i IntelliJ sin validering av workflows.
navikt · Apr 22, 2024 · 1ab902f · 1ab902f
1 parent b5e02ad
commit 1ab902f
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/alert-dolly.yml b/.github/workflows/alert-dolly.yml
@@ -18,4 +18,4 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/alerting-dolly.yml
+          RESOURCE: ".nais/alerting-dolly.yml"
diff --git a/.github/workflows/app.team-dolly-lokal-app.yml b/.github/workflows/app.team-dolly-lokal-app.yml
@@ -18,4 +18,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/team-dolly-lokal-app.yml
+          RESOURCE: ".nais/team-dolly-lokal-app.yml"
diff --git a/.github/workflows/common.workflow.backend.yml b/.github/workflows/common.workflow.backend.yml
@@ -54,6 +54,7 @@ on:
 jobs:
 
   start:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: "Logging"
@@ -126,7 +127,7 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/${{ inputs.nais-manifest }}
+          RESOURCE: "${{ inputs.working-directory }}/${{ inputs.nais-manifest }}"
           VAR: image=${{ needs.build.outputs.image }}
 
   deploy-test:
@@ -141,5 +142,5 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.test.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.test.yml"
           VAR: image=${{ needs.build.outputs.image }}
diff --git a/.github/workflows/common.workflow.frontend.yml b/.github/workflows/common.workflow.frontend.yml
@@ -69,6 +69,7 @@ on:
 jobs:
 
   start:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: "Logging"
@@ -160,7 +161,7 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.yml"
           VAR: image=${{ needs.build.outputs.image }}
 
   deploy-test:
@@ -175,7 +176,7 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.test.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.test.yml"
           VAR: image=${{ needs.build.outputs.image }}
 
   # Only used by dolly-frontend.
@@ -191,7 +192,7 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.idporten.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.idporten.yml"
           VAR: image=${{ needs.build.outputs.image }}
 
   # Only used by dolly-frontend.
@@ -207,5 +208,5 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.unstable.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.unstable.yml"
           VAR: image=${{ needs.build.outputs.image }}
diff --git a/.github/workflows/common.workflow.libs.backend.yml b/.github/workflows/common.workflow.libs.backend.yml
@@ -19,6 +19,7 @@ on:
 jobs:
 
   start:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: "Logging"

diff --git a/.github/workflows/common.workflow.libs.frontend.yml b/.github/workflows/common.workflow.libs.frontend.yml
@@ -12,6 +12,7 @@ on:
 jobs:
 
   start:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: "Logging"

diff --git a/.github/workflows/idporten.yml b/.github/workflows/idporten.yml
@@ -9,6 +9,7 @@ on:
 
 jobs:
   deploy-idporten:
+    if: github.event.pull_request.draft == false
     name: Deploy idporten
     runs-on: ubuntu-latest
     permissions:
@@ -19,4 +20,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: prod-gcp
-          RESOURCE: .nais/idporten.yml
+          RESOURCE: ".nais/idporten.yml"
diff --git a/.github/workflows/kafka-topics.yml b/.github/workflows/kafka-topics.yml
@@ -12,6 +12,7 @@ on:
 jobs:
   deploy-kafka-topics-dev:
     name: Deploy to Aiven Dev
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -22,4 +23,4 @@ jobs:
         env:
           CLUSTER: dev-gcp
           VAR: kafka-pool=nav-dev
-          RESOURCE: .nais/topics.yml
+          RESOURCE: ".nais/topics.yml"
diff --git a/.github/workflows/maskinporten.yml b/.github/workflows/maskinporten.yml
@@ -19,4 +19,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: prod-gcp
-          RESOURCE: .nais/maskinporten.yml
+          RESOURCE: ".nais/maskinporten.yml"
diff --git a/.github/workflows/opensearch.yml b/.github/workflows/opensearch.yml
@@ -21,4 +21,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/opensearch.yml
+          RESOURCE: ".nais/opensearch.yml"
diff --git a/.github/workflows/redis-dev.yml b/.github/workflows/redis-dev.yml
@@ -18,4 +18,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/redis-dev.yml
+          RESOURCE: ".nais/redis-dev.yml"
diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
@@ -20,4 +20,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/redis.yml
+          RESOURCE: ".nais/redis.yml"
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ on: @@
     jobs:
       start:
+        if: github.event.pull_request.draft == false
         runs-on: ubuntu-latest
         steps:
           - name: "Logging"
@@ Expand Down @@