bygg i deploy

navikt · Dec 2, 2024 · 2b51ddb · 2b51ddb
1 parent 2088357
commit 2b51ddb
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/.github/workflows/cicd-arrangor-flate.yaml b/.github/workflows/cicd-arrangor-flate.yaml
@@ -55,39 +55,38 @@ jobs:
     needs: playwright-version
     container:
       image: mcr.microsoft.com/playwright:v${{ needs.playwright-version.outputs.version }}-jammy
-    outputs:
-      image: ${{ steps.docker-build-push.outputs.image }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup frontend
         uses: ./.github/actions/setup-frontend
         env:
           NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
+      - name: Test
+        run: npx turbo run lint typecheck playwright --filter=@mr/arrangor-flate
+
+  deploy-til-dev:
+    name: Deploy til dev-gcp
+    needs: ci
+    if: github.event_name == 'push' && github.ref_name == 'main' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
       - name: Bygg applikasjon
-        run: npx turbo run lint typecheck pack --filter=@mr/arrangor-flate
+        run: npx turbo run pack --filter=@mr/arrangor-flate
       - name: Push docker image to GAR
         uses: nais/docker-build-push@v0
         id: docker-build-push
-        if: github.event_name == 'push' && github.ref_name == 'main' || github.event_name == 'workflow_dispatch'
         with:
           team: team-mulighetsrommet
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           docker_context: ./frontend/arrangor-flate
           image_suffix: arrangor-flate
-
-  deploy-til-dev:
-    name: Deploy til dev-gcp
-    needs: ci
-    if: github.event_name == 'push' && github.ref_name == 'main' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
           RESOURCE: frontend/arrangor-flate/.nais/nais-dev.yaml
-          VAR: image=${{ needs.ci.outputs.image }}
+          VAR: image=${{ steps.docker-build-push.outputs.image }}
 
   # TODO Skru på deploy til prod når alt er klart for arrangørflate
   # deploy-til-prod: