From b6cf917800651c92cd2ae289c0c705f309de5198 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Tue, 30 Jan 2024 10:51:05 +0100 Subject: [PATCH] =?UTF-8?q?Endret=20til=20=C3=A5=20bruke=20common.workflow?= =?UTF-8?q?.lib.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/common.workflow.lib.yml | 4 ++-- .github/workflows/lib.kafka-config.yml | 17 ++++------------- .github/workflows/lib.kafka-producers.yml | 17 ++++------------- .github/workflows/lib.reactive-core.yml | 17 ++++------------- .github/workflows/lib.reactive-frontend.yml | 17 ++++------------- .github/workflows/lib.reactive-proxy.yml | 19 +++++-------------- .github/workflows/lib.reactive-security.yml | 17 ++++------------- .../lib.reactive-session-security.yml | 17 ++++------------- .github/workflows/lib.security-core.yml | 17 ++++------------- .../workflows/lib.security-token-service.yml | 17 ++++------------- .github/workflows/lib.servlet-core.yml | 17 ++++------------- .../lib.servlet-insecure-security.yml | 17 ++++------------- .github/workflows/lib.servlet-security.yml | 17 ++++------------- .github/workflows/lib.testing.yml | 17 ++++------------- 14 files changed, 55 insertions(+), 172 deletions(-) diff --git a/.github/workflows/common.workflow.lib.yml b/.github/workflows/common.workflow.lib.yml index a49d918d65e..56e6d190f51 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.kafka-config.yml b/.github/workflows/lib.kafka-config.yml index 576bb4a5833..ecfa171100f 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.kafka-producers.yml b/.github/workflows/lib.kafka-producers.yml index 8253ca5cdeb..2601e459a55 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.reactive-core.yml b/.github/workflows/lib.reactive-core.yml index 38d51d7852d..b165672b59a 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.reactive-frontend.yml b/.github/workflows/lib.reactive-frontend.yml index d8bf44b4a49..8d03d650c6e 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.reactive-proxy.yml b/.github/workflows/lib.reactive-proxy.yml index c32450ec6a8..13bb0dcd2b0 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.reactive-security.yml b/.github/workflows/lib.reactive-security.yml index eae3a7900fc..c3837f6a2d2 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.reactive-session-security.yml b/.github/workflows/lib.reactive-session-security.yml index 86bf3e61252..e7ad240634f 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.security-core.yml b/.github/workflows/lib.security-core.yml index cbc9fa7be69..443cac8456f 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.security-token-service.yml b/.github/workflows/lib.security-token-service.yml index 09d270bcf07..686a8b6c48e 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.servlet-core.yml b/.github/workflows/lib.servlet-core.yml index c06eb0c9428..f8b9c001fb9 100644 --- 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 index d896ce38835..84a451b8bd7 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.servlet-security.yml b/.github/workflows/lib.servlet-security.yml index aa54f5ed036..033eaf68958 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/lib.testing.yml b/.github/workflows/lib.testing.yml index ec7fbb8fdfd..9381e3e3413 100644 --- 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 \ No newline at end of file