From e10f1b61d238174540f259ddf374a34e69f0e71b Mon Sep 17 00:00:00 2001 From: Nico <5772511+Death111@users.noreply.github.com> Date: Mon, 10 Mar 2025 21:20:17 +0100 Subject: [PATCH 1/6] try fix dependency check --- .github/workflows/mavenCi.yml | 41 ++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/.github/workflows/mavenCi.yml b/.github/workflows/mavenCi.yml index 3a018441..2c49af7d 100644 --- a/.github/workflows/mavenCi.yml +++ b/.github/workflows/mavenCi.yml @@ -55,18 +55,29 @@ jobs: uses: github/codeql-action/analyze@v3 dependency-check: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'corretto' - cache: maven - - - name: dependencyCheck - run: mvn dependency-check:check \ No newline at end of file + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'corretto' + cache: maven + - name: Depcheck + uses: dependency-check/Dependency-Check_Action@main + id: Depcheck + with: + project: 'KeepTime' + path: '.' + format: 'HTML' + out: 'reports' # this is the default, no need to specify unless you wish to override it + args: > + --failOnCVSS 8.9 + --enableRetired + - name: Upload Test results + uses: actions/upload-artifact@master + with: + name: Depcheck report + path: ${{github.workspace}}/reports \ No newline at end of file From 3c44d9601dd81392f62c58168a70c0d77ffa5527 Mon Sep 17 00:00:00 2001 From: Nico <5772511+Death111@users.noreply.github.com> Date: Mon, 10 Mar 2025 21:24:10 +0100 Subject: [PATCH 2/6] remove java --- .github/workflows/mavenCi.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/mavenCi.yml b/.github/workflows/mavenCi.yml index 2c49af7d..47e64077 100644 --- a/.github/workflows/mavenCi.yml +++ b/.github/workflows/mavenCi.yml @@ -15,7 +15,7 @@ on: jobs: build-analyze: - + if: false runs-on: ubuntu-latest env: @@ -59,12 +59,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'corretto' - cache: maven - name: Depcheck uses: dependency-check/Dependency-Check_Action@main id: Depcheck From 8823dd06da738afb9c4ebb07b018968b746f86ca Mon Sep 17 00:00:00 2001 From: Nico <5772511+Death111@users.noreply.github.com> Date: Mon, 10 Mar 2025 21:25:55 +0100 Subject: [PATCH 3/6] v4 --- .github/workflows/mavenCi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mavenCi.yml b/.github/workflows/mavenCi.yml index 47e64077..94012649 100644 --- a/.github/workflows/mavenCi.yml +++ b/.github/workflows/mavenCi.yml @@ -71,7 +71,7 @@ jobs: --failOnCVSS 8.9 --enableRetired - name: Upload Test results - uses: actions/upload-artifact@master + uses: actions/upload-artifact@v4 with: name: Depcheck report path: ${{github.workspace}}/reports \ No newline at end of file From 28cad6a75eb0995b4f43e6d772fd5d9778b83e1c Mon Sep 17 00:00:00 2001 From: Nico <5772511+Death111@users.noreply.github.com> Date: Mon, 10 Mar 2025 21:31:54 +0100 Subject: [PATCH 4/6] test --- .github/workflows/mavenCi.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/mavenCi.yml b/.github/workflows/mavenCi.yml index 94012649..49d87418 100644 --- a/.github/workflows/mavenCi.yml +++ b/.github/workflows/mavenCi.yml @@ -59,9 +59,20 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'corretto' + cache: maven + - name: Build + run: mvn -V -B clean package - name: Depcheck uses: dependency-check/Dependency-Check_Action@main id: Depcheck + env: + # actions/setup-java@v1 changes JAVA_HOME so it needs to be reset to match the depcheck image + JAVA_HOME: /opt/jdk with: project: 'KeepTime' path: '.' From 61eafbcdf216d97f380b89fbe20b513513ab4f68 Mon Sep 17 00:00:00 2001 From: Nico <5772511+Death111@users.noreply.github.com> Date: Mon, 10 Mar 2025 21:36:42 +0100 Subject: [PATCH 5/6] always --- .github/workflows/mavenCi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mavenCi.yml b/.github/workflows/mavenCi.yml index 49d87418..33023bc1 100644 --- a/.github/workflows/mavenCi.yml +++ b/.github/workflows/mavenCi.yml @@ -82,6 +82,7 @@ jobs: --failOnCVSS 8.9 --enableRetired - name: Upload Test results + if: always() uses: actions/upload-artifact@v4 with: name: Depcheck report From 42e7eba3e2b219d95f2cc0a97e75f13df598e86c Mon Sep 17 00:00:00 2001 From: Nico <5772511+Death111@users.noreply.github.com> Date: Mon, 10 Mar 2025 21:40:43 +0100 Subject: [PATCH 6/6] reenable normal checks --- .github/workflows/mavenCi.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/mavenCi.yml b/.github/workflows/mavenCi.yml index 33023bc1..e3d7aace 100644 --- a/.github/workflows/mavenCi.yml +++ b/.github/workflows/mavenCi.yml @@ -15,7 +15,6 @@ on: jobs: build-analyze: - if: false runs-on: ubuntu-latest env: