From 9df3b1ba8889ca808361fc0822678dfd607e4b39 Mon Sep 17 00:00:00 2001 From: frodehansen2 Date: Fri, 20 Sep 2024 08:40:48 +0200 Subject: [PATCH 1/2] legge til ci-skip conditional i test-workflows (#2230) --- .github/workflows/test.dine-pleiepenger.yml | 2 ++ .../test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml | 2 ++ .github/workflows/test.endringsmelding-pleiepenger.yml | 2 ++ .github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml | 2 ++ .github/workflows/test.omsorgsdager-kalkulator.yml | 2 ++ .../test.omsorgspengerutbetaling-arbeidstaker-soknad.yml | 2 ++ .github/workflows/test.omsorgspengerutbetaling-soknad.yml | 2 ++ ".github/workflows/test.omsorgspenges\303\270knad.yml" | 2 ++ .../workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml | 2 ++ .github/workflows/test.pleiepenger-sykt-barn.yml | 2 ++ .github/workflows/test.sif-ettersending.yml | 2 ++ 11 files changed, 22 insertions(+) diff --git a/.github/workflows/test.dine-pleiepenger.yml b/.github/workflows/test.dine-pleiepenger.yml index 0011073e48..3655879b2d 100644 --- a/.github/workflows/test.dine-pleiepenger.yml +++ b/.github/workflows/test.dine-pleiepenger.yml @@ -18,6 +18,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -45,6 +46,7 @@ jobs: run: yarn test --filter=@navikt/dine-pleiepenger run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml b/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml index d72052b99f..c0552637d1 100644 --- a/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml +++ b/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml @@ -18,6 +18,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -45,6 +46,7 @@ jobs: run: yarn test --filter=@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.endringsmelding-pleiepenger.yml b/.github/workflows/test.endringsmelding-pleiepenger.yml index 4e0ad42c7d..cee3787271 100644 --- a/.github/workflows/test.endringsmelding-pleiepenger.yml +++ b/.github/workflows/test.endringsmelding-pleiepenger.yml @@ -18,6 +18,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -45,6 +46,7 @@ jobs: run: yarn test --filter=@navikt/endringsmelding-pleiepenger run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml b/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml index 7332fa0cff..757d57bf61 100644 --- a/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml +++ b/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml @@ -18,6 +18,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -45,6 +46,7 @@ jobs: run: yarn test --filter=@navikt/omsorgsdager-aleneomsorg-dialog run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.omsorgsdager-kalkulator.yml b/.github/workflows/test.omsorgsdager-kalkulator.yml index 505a63d858..6d7adff461 100644 --- a/.github/workflows/test.omsorgsdager-kalkulator.yml +++ b/.github/workflows/test.omsorgsdager-kalkulator.yml @@ -18,6 +18,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -45,6 +46,7 @@ jobs: run: yarn test --filter=@navikt/omsorgsdager-kalkulator run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.omsorgspengerutbetaling-arbeidstaker-soknad.yml b/.github/workflows/test.omsorgspengerutbetaling-arbeidstaker-soknad.yml index 0ad41572ec..18b10d52ac 100644 --- a/.github/workflows/test.omsorgspengerutbetaling-arbeidstaker-soknad.yml +++ b/.github/workflows/test.omsorgspengerutbetaling-arbeidstaker-soknad.yml @@ -27,6 +27,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -54,6 +55,7 @@ jobs: run: yarn test --filter=@navikt/omsorgspengerutbetaling-arbeidstaker-soknad run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.omsorgspengerutbetaling-soknad.yml b/.github/workflows/test.omsorgspengerutbetaling-soknad.yml index 80b81a0d12..2089d24764 100644 --- a/.github/workflows/test.omsorgspengerutbetaling-soknad.yml +++ b/.github/workflows/test.omsorgspengerutbetaling-soknad.yml @@ -27,6 +27,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -54,6 +55,7 @@ jobs: run: yarn test --filter=@navikt/omsorgspengerutbetaling-soknad run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git "a/.github/workflows/test.omsorgspenges\303\270knad.yml" "b/.github/workflows/test.omsorgspenges\303\270knad.yml" index a718b46751..53c275a86f 100644 --- "a/.github/workflows/test.omsorgspenges\303\270knad.yml" +++ "b/.github/workflows/test.omsorgspenges\303\270knad.yml" @@ -18,6 +18,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -45,6 +46,7 @@ jobs: run: yarn test --filter=@navikt/omsorgspengesoknad run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml b/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml index 58499b5f83..a480c7ea95 100644 --- a/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml +++ b/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml @@ -18,6 +18,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -45,6 +46,7 @@ jobs: run: yarn test --filter=@navikt/pleiepenger-i-livets-sluttfase-soknad run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.pleiepenger-sykt-barn.yml b/.github/workflows/test.pleiepenger-sykt-barn.yml index bf65fc8ae7..9ea571a665 100644 --- a/.github/workflows/test.pleiepenger-sykt-barn.yml +++ b/.github/workflows/test.pleiepenger-sykt-barn.yml @@ -17,6 +17,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -44,6 +45,7 @@ jobs: run: yarn test --filter=@navikt/pleiepenger-sykt-barn run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.sif-ettersending.yml b/.github/workflows/test.sif-ettersending.yml index 63dce79b53..0c707f53bb 100644 --- a/.github/workflows/test.sif-ettersending.yml +++ b/.github/workflows/test.sif-ettersending.yml @@ -18,6 +18,7 @@ env: jobs: run-script-tests: + if: '!contains(github.event.head_commit.message, "[ci skip]")' runs-on: ubuntu-latest steps: - name: Checkout @@ -45,6 +46,7 @@ jobs: run: yarn test --filter=@navikt/sif-ettersending run-playwright-test: + if: '!contains(github.event.head_commit.message, "[ci skip]")' timeout-minutes: 60 runs-on: ubuntu-latest steps: From 72aaade76e720742dd479c2b39fee8540d5fcbbb Mon Sep 17 00:00:00 2001 From: frodehansen2 Date: Fri, 20 Sep 2024 08:47:28 +0200 Subject: [PATCH 2/2] Fix workflow statement (#2232) --- .github/workflows/test.dine-pleiepenger.yml | 4 ++-- .../test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml | 4 ++-- .github/workflows/test.endringsmelding-pleiepenger.yml | 4 ++-- .github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml | 4 ++-- .github/workflows/test.omsorgsdager-kalkulator.yml | 4 ++-- .../test.omsorgspengerutbetaling-arbeidstaker-soknad.yml | 4 ++-- .github/workflows/test.omsorgspengerutbetaling-soknad.yml | 4 ++-- ".github/workflows/test.omsorgspenges\303\270knad.yml" | 4 ++-- .../workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml | 4 ++-- .github/workflows/test.pleiepenger-sykt-barn.yml | 4 ++-- .github/workflows/test.sif-ettersending.yml | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.dine-pleiepenger.yml b/.github/workflows/test.dine-pleiepenger.yml index 3655879b2d..f702772416 100644 --- a/.github/workflows/test.dine-pleiepenger.yml +++ b/.github/workflows/test.dine-pleiepenger.yml @@ -18,7 +18,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -46,7 +46,7 @@ jobs: run: yarn test --filter=@navikt/dine-pleiepenger run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml b/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml index c0552637d1..2c32cfb426 100644 --- a/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml +++ b/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml @@ -18,7 +18,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -46,7 +46,7 @@ jobs: run: yarn test --filter=@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.endringsmelding-pleiepenger.yml b/.github/workflows/test.endringsmelding-pleiepenger.yml index cee3787271..956a2f19fe 100644 --- a/.github/workflows/test.endringsmelding-pleiepenger.yml +++ b/.github/workflows/test.endringsmelding-pleiepenger.yml @@ -18,7 +18,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -46,7 +46,7 @@ jobs: run: yarn test --filter=@navikt/endringsmelding-pleiepenger run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml b/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml index 757d57bf61..899e43c268 100644 --- a/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml +++ b/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml @@ -18,7 +18,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -46,7 +46,7 @@ jobs: run: yarn test --filter=@navikt/omsorgsdager-aleneomsorg-dialog run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.omsorgsdager-kalkulator.yml b/.github/workflows/test.omsorgsdager-kalkulator.yml index 6d7adff461..6684c448a0 100644 --- a/.github/workflows/test.omsorgsdager-kalkulator.yml +++ b/.github/workflows/test.omsorgsdager-kalkulator.yml @@ -18,7 +18,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -46,7 +46,7 @@ jobs: run: yarn test --filter=@navikt/omsorgsdager-kalkulator run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.omsorgspengerutbetaling-arbeidstaker-soknad.yml b/.github/workflows/test.omsorgspengerutbetaling-arbeidstaker-soknad.yml index 18b10d52ac..36b4d041c7 100644 --- a/.github/workflows/test.omsorgspengerutbetaling-arbeidstaker-soknad.yml +++ b/.github/workflows/test.omsorgspengerutbetaling-arbeidstaker-soknad.yml @@ -27,7 +27,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -55,7 +55,7 @@ jobs: run: yarn test --filter=@navikt/omsorgspengerutbetaling-arbeidstaker-soknad run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.omsorgspengerutbetaling-soknad.yml b/.github/workflows/test.omsorgspengerutbetaling-soknad.yml index 2089d24764..71d484e042 100644 --- a/.github/workflows/test.omsorgspengerutbetaling-soknad.yml +++ b/.github/workflows/test.omsorgspengerutbetaling-soknad.yml @@ -27,7 +27,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -55,7 +55,7 @@ jobs: run: yarn test --filter=@navikt/omsorgspengerutbetaling-soknad run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git "a/.github/workflows/test.omsorgspenges\303\270knad.yml" "b/.github/workflows/test.omsorgspenges\303\270knad.yml" index 53c275a86f..9e1cae22ed 100644 --- "a/.github/workflows/test.omsorgspenges\303\270knad.yml" +++ "b/.github/workflows/test.omsorgspenges\303\270knad.yml" @@ -18,7 +18,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -46,7 +46,7 @@ jobs: run: yarn test --filter=@navikt/omsorgspengesoknad run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml b/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml index a480c7ea95..ba9ff8b361 100644 --- a/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml +++ b/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml @@ -18,7 +18,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -46,7 +46,7 @@ jobs: run: yarn test --filter=@navikt/pleiepenger-i-livets-sluttfase-soknad run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.pleiepenger-sykt-barn.yml b/.github/workflows/test.pleiepenger-sykt-barn.yml index 9ea571a665..ba7f97a657 100644 --- a/.github/workflows/test.pleiepenger-sykt-barn.yml +++ b/.github/workflows/test.pleiepenger-sykt-barn.yml @@ -17,7 +17,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -45,7 +45,7 @@ jobs: run: yarn test --filter=@navikt/pleiepenger-sykt-barn run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.sif-ettersending.yml b/.github/workflows/test.sif-ettersending.yml index 0c707f53bb..ce32990089 100644 --- a/.github/workflows/test.sif-ettersending.yml +++ b/.github/workflows/test.sif-ettersending.yml @@ -18,7 +18,7 @@ env: jobs: run-script-tests: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: - name: Checkout @@ -46,7 +46,7 @@ jobs: run: yarn test --filter=@navikt/sif-ettersending run-playwright-test: - if: '!contains(github.event.head_commit.message, "[ci skip]")' + if: "!contains(github.event.head_commit.message, '[ci skip]')" timeout-minutes: 60 runs-on: ubuntu-latest steps: