Endret til å bruke common.workflow.lib.

navikt · Jan 30, 2024 · b6cf917 · b6cf917
1 parent 97fea20
commit b6cf917
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 172 deletions.
diff --git a/.github/workflows/common.workflow.lib.yml b/.github/workflows/common.workflow.lib.yml
@@ -55,9 +55,9 @@ jobs:
           NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       - name: "Reporting"
-        #if: failure() && steps.gradle.outcome == 'failure'
+        if: failure() && steps.gradle.outcome == 'failure'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ needs.start.outputs.artifact}}
-          path: ${{ inputs.working-directory }}/build/classes
+          path: ${{ inputs.working-directory }}/build/reports
           retention-days: 7
diff --git a/.github/workflows/lib.kafka-config.yml b/.github/workflows/lib.kafka-config.yml
@@ -1,4 +1,4 @@
-name: Lib kafka-config
+name: kafka-config
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.kafka-config.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/kafka-config/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/kafka-config/'
+      working-directory: 'libs/kafka-config'
     secrets: inherit
diff --git a/.github/workflows/lib.kafka-producers.yml b/.github/workflows/lib.kafka-producers.yml
@@ -1,4 +1,4 @@
-name: Lib kafka-producers
+name: kafka-producers
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.kafka-producers.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/kafka-producers/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/kafka-producers/'
+      working-directory: 'libs/kafka-producers'
     secrets: inherit
diff --git a/.github/workflows/lib.reactive-core.yml b/.github/workflows/lib.reactive-core.yml
@@ -1,4 +1,4 @@
-name: Lib reactive-core
+name: reactive-core
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.reactive-core.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/reactive-core/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/reactive-core/'
+      working-directory: 'libs/reactive-core'
     secrets: inherit
diff --git a/.github/workflows/lib.reactive-frontend.yml b/.github/workflows/lib.reactive-frontend.yml
@@ -1,4 +1,4 @@
-name: Lib reactive-frontend
+name: reactive-frontend
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.reactive-frontend.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/reactive-frontend/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/reactive-frontend/'
+      working-directory: 'libs/reactive-frontend'
     secrets: inherit
diff --git a/.github/workflows/lib.reactive-proxy.yml b/.github/workflows/lib.reactive-proxy.yml
@@ -1,4 +1,4 @@
-name: Lib reactive-proxy
+name: reactive-proxy
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.reactive-proxy.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/reactive-proxy/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/reactive-proxy/'
-    secrets: inherit
+      working-directory: 'libs/reactive-proxy'
+    secrets: inherit
diff --git a/.github/workflows/lib.reactive-security.yml b/.github/workflows/lib.reactive-security.yml
@@ -1,4 +1,4 @@
-name: Lib reactive-security
+name: reactive-security
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.reactive-security.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/reactive-security/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/reactive-security/'
+      working-directory: 'libs/reactive-security'
     secrets: inherit
diff --git a/.github/workflows/lib.reactive-session-security.yml b/.github/workflows/lib.reactive-session-security.yml
@@ -1,4 +1,4 @@
-name: Lib reactive-session-security
+name: reactive-session-security
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.reactive-session-security.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/reactive-session-security/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/reactive-session-security/'
+      working-directory: 'libs/reactive-session-security'
     secrets: inherit
diff --git a/.github/workflows/lib.security-core.yml b/.github/workflows/lib.security-core.yml
@@ -1,4 +1,4 @@
-name: Lib security-core
+name: security-core
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.security-core.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/security-core/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/security-core/'
+      working-directory: 'libs/security-core'
     secrets: inherit
diff --git a/.github/workflows/lib.security-token-service.yml b/.github/workflows/lib.security-token-service.yml
@@ -1,4 +1,4 @@
-name: Lib security-token-service
+name: security-token-service
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.security-token-service.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/security-token-service/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/security-token-service/'
+      working-directory: 'libs/security-token-service'
     secrets: inherit
diff --git a/.github/workflows/lib.servlet-core.yml b/.github/workflows/lib.servlet-core.yml
@@ -1,4 +1,4 @@
-name: Lib servlet-core
+name: servlet-core
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.servlet-core.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/servlet-core/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/servlet-core/'
+      working-directory: 'libs/servlet-core'
     secrets: inherit
diff --git a/.github/workflows/lib.servlet-insecure-security.yml b/.github/workflows/lib.servlet-insecure-security.yml
@@ -1,4 +1,4 @@
-name: Lib servlet-insecure-security
+name: servlet-insecure-security
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.servlet-insecure-security.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/servlet-insecure-security/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/servlet-insecure-security/'
+      working-directory: 'libs/servlet-insecure-security'
     secrets: inherit
diff --git a/.github/workflows/lib.servlet-security.yml b/.github/workflows/lib.servlet-security.yml
@@ -1,4 +1,4 @@
-name: Lib servlet-security
+name: servlet-security
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.commanservlet-securityds.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/servlet-security/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/servlet-security/'
+      working-directory: 'libs/servlet-security'
     secrets: inherit
diff --git a/.github/workflows/lib.testing.yml b/.github/workflows/lib.testing.yml
@@ -1,4 +1,4 @@
-name: Lib testing
+name: testing
 
 on:
   push:
@@ -7,17 +7,8 @@ on:
       - .github/workflows/lib.testing.yml
 
 jobs:
-  scan:
-    name: Scan
-    uses: ./.github/workflows/common.scan.sonar.yml
+  workflow:
+    uses: ./.github/workflows/common.workflow.lib.yml
     with:
-      working-directory: 'libs/testing/'
-    secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  build:
-    name: Build
-    uses: ./.github/workflows/common.java-build.yml
-    with:
-      working-directory: 'libs/testing/'
+      working-directory: 'libs/testing'
     secrets: inherit