Merge pull request #332 from navikt/forenkle_bygg

forenkle workflow for bygg
navikt · Oct 12, 2023 · 47743c7 · 47743c7
2 parents 2bf689d + 02a7f03
commit 47743c7
Showing 1 changed file with 13 additions and 27 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -4,9 +4,12 @@ on:
   workflow_dispatch:
 
 jobs:
-  test:
-    name: Test
+  bygg:
+    name: Bygg
     runs-on: ubuntu-latest
+    permissions:
+      contents: "read"
+      id-token: "write"
     services:
       postgres:
         image: postgres:12.10
@@ -29,32 +32,15 @@ jobs:
           java-version: 17
           cache: maven
 
-      - run: mvn -B -Dsurefire.useFile=false test
-
-  bygg:
-    name: Bygg
-    needs: test
-    runs-on: ubuntu-latest
-    permissions:
-      contents: "read"
-      id-token: "write"
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: 17
-        cache: maven
-
-    - run: mvn -B -DskipTests package
+      - run: mvn -B package
 
-    - uses: nais/docker-build-push@v0
-      id: gar-push
-      with:
-        team: fager
-        tag: ${{ github.sha }}
-        project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
-        identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+      - uses: nais/docker-build-push@v0
+        id: gar-push
+        with:
+          team: fager
+          tag: ${{ github.sha }}
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
 
   deploy-dev-gcp:
     permissions: