From e9b67f95002934fd910d5dc171f4c40b3d7e4616 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 9 May 2024 12:59:57 +0200 Subject: [PATCH 1/4] use .java-version in the workflows --- .github/workflows/auto-update-otel-sdk.yml | 2 +- .github/workflows/build-common.yml | 14 +++++++------- .github/workflows/build.yml | 2 +- .github/workflows/codeql-daily.yml | 2 +- .github/workflows/owasp-dependency-check-daily.yml | 2 +- .../pr-smoke-test-fake-backend-images.yml | 4 ++-- .github/workflows/pr-smoke-test-servlet-images.yml | 2 +- .../publish-smoke-test-fake-backend-images.yml | 4 ++-- .../publish-smoke-test-servlet-images.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/reusable-muzzle.yml | 2 +- .github/workflows/reusable-native-tests.yml | 4 +++- .github/workflows/reusable-smoke-test-images.yml | 2 +- .github/workflows/reusable-test-indy.yml | 2 +- .github/workflows/reusable-test-latest-deps.yml | 2 +- 15 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/auto-update-otel-sdk.yml b/.github/workflows/auto-update-otel-sdk.yml index 49704a30bada..6c4307050503 100644 --- a/.github/workflows/auto-update-otel-sdk.yml +++ b/.github/workflows/auto-update-otel-sdk.yml @@ -69,7 +69,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 050618de5633..7af992781de5 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -35,7 +35,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 @@ -68,7 +68,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 @@ -138,7 +138,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Increase gradle daemon heap size run: | @@ -220,7 +220,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version # vaadin 14 tests fail with node 18 - name: Set up Node @@ -335,7 +335,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Set up Gradle cache uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 @@ -388,7 +388,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 @@ -411,7 +411,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Set up Gradle cache uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6adc60782dbd..e97be25c00db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,7 +70,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml index c46891b79a33..30e6869a4c78 100644 --- a/.github/workflows/codeql-daily.yml +++ b/.github/workflows/codeql-daily.yml @@ -27,7 +27,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Initialize CodeQL uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4 diff --git a/.github/workflows/owasp-dependency-check-daily.yml b/.github/workflows/owasp-dependency-check-daily.yml index 98239795df2e..9706da73c31c 100644 --- a/.github/workflows/owasp-dependency-check-daily.yml +++ b/.github/workflows/owasp-dependency-check-daily.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Increase gradle daemon heap size run: | diff --git a/.github/workflows/pr-smoke-test-fake-backend-images.yml b/.github/workflows/pr-smoke-test-fake-backend-images.yml index 52da4d800093..f8143b98e708 100644 --- a/.github/workflows/pr-smoke-test-fake-backend-images.yml +++ b/.github/workflows/pr-smoke-test-fake-backend-images.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 @@ -49,7 +49,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 diff --git a/.github/workflows/pr-smoke-test-servlet-images.yml b/.github/workflows/pr-smoke-test-servlet-images.yml index d74e1a31551f..50880664b23d 100644 --- a/.github/workflows/pr-smoke-test-servlet-images.yml +++ b/.github/workflows/pr-smoke-test-servlet-images.yml @@ -40,7 +40,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Set up Gradle cache uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 diff --git a/.github/workflows/publish-smoke-test-fake-backend-images.yml b/.github/workflows/publish-smoke-test-fake-backend-images.yml index 5ff323e1c5c8..29a620e0a784 100644 --- a/.github/workflows/publish-smoke-test-fake-backend-images.yml +++ b/.github/workflows/publish-smoke-test-fake-backend-images.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Login to GitHub package registry uses: docker/login-action@v3 @@ -55,7 +55,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Login to GitHub package registry uses: azure/docker-login@v1 diff --git a/.github/workflows/publish-smoke-test-servlet-images.yml b/.github/workflows/publish-smoke-test-servlet-images.yml index 95c304549fe1..a192a3b6100b 100644 --- a/.github/workflows/publish-smoke-test-servlet-images.yml +++ b/.github/workflows/publish-smoke-test-servlet-images.yml @@ -57,7 +57,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Login to GitHub package registry uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8fccfceba857..58fe2621ddbf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -83,7 +83,7 @@ jobs: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 diff --git a/.github/workflows/reusable-muzzle.yml b/.github/workflows/reusable-muzzle.yml index c1033b4d4f64..56e140c21a86 100644 --- a/.github/workflows/reusable-muzzle.yml +++ b/.github/workflows/reusable-muzzle.yml @@ -31,7 +31,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Setup Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 diff --git a/.github/workflows/reusable-native-tests.yml b/.github/workflows/reusable-native-tests.yml index 9a677360378e..5212493c1bf7 100644 --- a/.github/workflows/reusable-native-tests.yml +++ b/.github/workflows/reusable-native-tests.yml @@ -13,10 +13,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - id: read-java + run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT" - uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1.1 with: version: "latest" - java-version: "21" + java-version: "${{ steps.read-java.outputs.version }}" components: "native-image" - name: Running test run: | diff --git a/.github/workflows/reusable-smoke-test-images.yml b/.github/workflows/reusable-smoke-test-images.yml index b72af52e56b4..66123991b59b 100644 --- a/.github/workflows/reusable-smoke-test-images.yml +++ b/.github/workflows/reusable-smoke-test-images.yml @@ -47,7 +47,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Login to GitHub package registry if: inputs.publish diff --git a/.github/workflows/reusable-test-indy.yml b/.github/workflows/reusable-test-indy.yml index 6045802006fc..62258a6b984d 100644 --- a/.github/workflows/reusable-test-indy.yml +++ b/.github/workflows/reusable-test-indy.yml @@ -39,7 +39,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Increase gradle daemon heap size run: | diff --git a/.github/workflows/reusable-test-latest-deps.yml b/.github/workflows/reusable-test-latest-deps.yml index f2fc33513020..8207653f5fd2 100644 --- a/.github/workflows/reusable-test-latest-deps.yml +++ b/.github/workflows/reusable-test-latest-deps.yml @@ -38,7 +38,7 @@ jobs: uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: temurin - java-version: 21 + java-version-file: .java-version - name: Increase gradle daemon heap size run: | From f10a057be341b7c51a0538201dfc7cb9788f4c98 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 9 May 2024 13:01:43 +0200 Subject: [PATCH 2/4] revert f6d3b6b70bef79cecc4355115875e197dd311c5a --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6eb86aa73185..d5e39e5b25bd 100644 --- a/.gitignore +++ b/.gitignore @@ -54,7 +54,6 @@ out/ /workspace java-agent/benchmark-integration/perf-test-settings.rc derby.log -.java-version hs_err_pid* replay_pid* .attach_pid* From a0410d9d34f0fab1e80147d4c0ab2295997a254f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 9 May 2024 13:02:02 +0200 Subject: [PATCH 3/4] use java version file --- .java-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .java-version diff --git a/.java-version b/.java-version new file mode 100644 index 000000000000..8e2afd342773 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +17 \ No newline at end of file From b6119b037cd0e0c795168fbd7fcf8150598aebcb Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 9 May 2024 13:04:05 +0200 Subject: [PATCH 4/4] bump version 21 --- .java-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.java-version b/.java-version index 8e2afd342773..b5045cc4046d 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -17 \ No newline at end of file +21 \ No newline at end of file