From 641c45646ec1aef485fb07d7bda78f39fa9d633c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Str=C3=B8m?= Date: Tue, 2 Jan 2024 10:37:49 +0100 Subject: [PATCH] Fikser trigger for deploy av dependabot i build-and-deploy-preprod.yml --- .github/workflows/build-and-deploy-preprod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml index 585a41641..90b581877 100644 --- a/.github/workflows/build-and-deploy-preprod.yml +++ b/.github/workflows/build-and-deploy-preprod.yml @@ -75,7 +75,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Deploy til dev-gcp team namespace - if: (github.triggering_actor != 'dependabot[bot]' || github.event_name != 'merge_group') + if: (github.triggering_actor != 'dependabot[bot]' && github.event_name != 'merge_group') uses: nais/deploy/actions/deploy@v2 env: APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}