diff --git a/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml b/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml index b3a5e46622..e6270c4b11 100644 --- a/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml +++ b/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml @@ -10,53 +10,20 @@ on: workflow_dispatch: jobs: - run-tests: - name: Run tests - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup Node.js environment - uses: actions/setup-node@v4 - with: - node-version: 18 - cache: 'yarn' - - - name: Install dependencies (yarn) - run: yarn - - - name: Run code tests - run: yarn test --filter=pleiepenger-sykt-barn - - - name: Build and start e2e server - uses: cypress-io/github-action@v6.6.0 - env: - DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false - PUBLIC_PATH: /familie/sykdom-i-familien/soknad/pleiepenger - FRONTEND_API_PATH: http://localhost:8082/ - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - project: ./apps/pleiepenger-sykt-barn/e2e - build: yarn build-pleiepenger-sykt-barn - start: yarn turbo start-e2e-server --filter=pleiepenger-sykt-barn - wait-on: 'http://localhost:8080' - wait-on-timeout: 60 - runTests: false - - - name: Run cypress tests - run: yarn turbo cypress-run --filter=pleiepenger-sykt-barn - - deploy-to-prod: - name: Deploy pleiepenger-sykt-barn to prod - needs: [run-tests] - uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main - secrets: inherit - permissions: - contents: write - security-events: write - id-token: write - actions: read - with: - app-name: 'pleiepenger-sykt-barn' - working-directory: 'apps/pleiepenger-sykt-barn' + run-tests: + uses: ./.github/workflows/test.pleiepenger-sykt-barn.yml + secrets: inherit + + deploy-to-prod: + name: Deploy pleiepenger-sykt-barn to prod + needs: [run-tests] + uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main + secrets: inherit + permissions: + contents: write + security-events: write + id-token: write + actions: read + with: + app-name: 'pleiepenger-sykt-barn' + working-directory: 'apps/pleiepenger-sykt-barn' diff --git a/.github/workflows/test.pleiepenger-sykt-barn.yml b/.github/workflows/test.pleiepenger-sykt-barn.yml index 9d29462f5e..cc0d17a929 100644 --- a/.github/workflows/test.pleiepenger-sykt-barn.yml +++ b/.github/workflows/test.pleiepenger-sykt-barn.yml @@ -40,6 +40,7 @@ jobs: - name: Run code tests run: yarn test --filter=pleiepenger-sykt-barn + run-cypress-test: runs-on: ubuntu-latest steps: