diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml index 078ab95b0..be73fd2e5 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@v1 env: APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }} diff --git a/pom.xml b/pom.xml index b20b7d5ee..7e6fca069 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 2.20231026103714_2f17845 2.20231201131108_ea25dd3 - 3.0_20231130135617_c1535fc + 3.0_20231205102047_74d51af no.nav.familie.baks.mottak.LauncherKt 4.0.4 3.1.0