From 7919730286cef677c07c5121271e1739ee7ea9a9 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jul 2024 11:53:46 -0700 Subject: [PATCH 1/6] chore: Compile using java 17 --- .github/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d38263..7fe246c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,12 @@ jobs: steps: - name: checkout code uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + ## We target 11, but compile with 17. + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: 11 + distribution: 'temurin' + java-version: 17 - name: run tests run: | ./gradlew check aggregatedJacocoReport From 9977e4ffefd6cdae74dbc724e61895fe2678352c Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jul 2024 11:55:19 -0700 Subject: [PATCH 2/6] Update build_cd_artifacts.yml --- .github/workflows/build_cd_artifacts.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_cd_artifacts.yml b/.github/workflows/build_cd_artifacts.yml index ded84f7..215f699 100644 --- a/.github/workflows/build_cd_artifacts.yml +++ b/.github/workflows/build_cd_artifacts.yml @@ -16,9 +16,10 @@ jobs: uses: actions/checkout@v2 - name: setup JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 11 + distribution: 'temurin' + java-version: 17 - name: build run: ./gradlew releaseBundle $GRADLE_ARGS From 9e16c2fe2779214a0de34b88fa8a484cf0862880 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jul 2024 11:55:54 -0700 Subject: [PATCH 3/6] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a7f2b33..2178710 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,8 @@ jobs: - name: Setup Java JDK uses: actions/setup-java@v1 with: - java-version: 11 + distribution: 'temurin' + java-version: 17 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From 201624ad91db69521a02a00c804651980d510deb Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jul 2024 11:56:23 -0700 Subject: [PATCH 4/6] Update release.yml --- .github/workflows/release.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index afa2e3f..fdcd5c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,11 +13,12 @@ jobs: - name: checkout code uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: 11 - + java-version: 17 + distribution: 'temurin' + - name: run tests run: ./gradlew test From 6beb7f3221e0dd872ac774c28670c2991de9f252 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jul 2024 11:56:38 -0700 Subject: [PATCH 5/6] Update runCompatibilityTest.yml --- .github/workflows/runCompatibilityTest.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/runCompatibilityTest.yml b/.github/workflows/runCompatibilityTest.yml index 4d4eae1..98e5693 100644 --- a/.github/workflows/runCompatibilityTest.yml +++ b/.github/workflows/runCompatibilityTest.yml @@ -15,9 +15,10 @@ jobs: ref: ${{ github.event.client_payload.sha }} - name: set up java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 + distribution: 'temurin' - name: run tests uses: armory-io/plugin-test-runner@main From 0d874c9d3e567aa65d8a674b3ce6921cb821c31a Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jul 2024 13:01:29 -0700 Subject: [PATCH 6/6] chore: Update gradle.properties with latest versions for builds --- gradle.properties | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index dee4dcb..179e65e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,19 @@ org.gradle.parallel=true -spinnakerGradleVersion=8.15.0 +spinnakerGradleVersion=8.32.1 pf4jVersion=3.2.0 -korkVersion=7.123.0 +korkVersion=7.236.0 # The service versions listed below are not needed for the actual plugin to function # but are being added in order to enable plugin compatibility testing for the plugin -clouddriverVersion=2022.02.24.19.52.46.release-1.27.x -echoVersion=2022.01.19.07.51.20.release-1.27.x -fiatVersion=2022.03.02.18.55.09.release-1.27.x -front50Version=2022.01.19.08.45.30.release-1.27.x -gateVersion=2022.02.03.20.15.21.release-1.27.x -igorVersion=2022.01.19.07.32.50.release-1.27.x -kayentaVersion=2022.02.16.00.31.30.release-1.27.x -orcaVersion=2022.02.15.22.24.23.release-1.27.x -roscoVersion=2021.08.03.20.41.14.master +clouddriverVersion=2024.07.17.17.30.47.master +echoVersion=2024.07.30.18.39.41.master +fiatVersion=2024.07.02.18.24.28.master +front50Version=2024.07.30.18.37.55.master +gateVersion=2024.07.17.18.06.59.master +igorVersion=2024.07.30.18.41.52.master +kayentaVersion=2024.07.03.20.32.39.master +orcaVersion=2024.07.16.20.38.37.master +roscoVersion=2024.07.02.18.24.20.master # TODO figure this out (hint, we need the following: https://github.com/spinnaker/kork/pull/592/files) clouddriverMinimumSuppotedVersion=0.0.0