Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: use .java-version #11323

Merged
merged 4 commits into from
May 15, 2024
+26 −24
Merged

ci: use .java-version #11323

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9b67f9
use .java-version in the workflows
v1v May 9, 2024
f10a057
revert f6d3b6b70bef79cecc4355115875e197dd311c5a
v1v May 9, 2024
a0410d9
use java version file
v1v May 9, 2024
b6119b0
bump version 21
v1v May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-update-otel-sdk.yml
View file
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions .github/workflows/build-common.yml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/codeql-daily.yml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/owasp-dependency-check-daily.yml
View file
Original file line number Diff line number Diff line change
@@ -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: |
4 changes: 2 additions & 2 deletions .github/workflows/pr-smoke-test-fake-backend-images.yml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/pr-smoke-test-servlet-images.yml
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions .github/workflows/publish-smoke-test-fake-backend-images.yml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/publish-smoke-test-servlet-images.yml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/reusable-muzzle.yml
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion .github/workflows/reusable-native-tests.yml
View file
Original file line number Diff line number Diff line change
@@ -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 }}"
Comment on lines +16 to +21
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be potentially once graalvm/setup-graalvm#95 is done :)

components: "native-image"
- name: Running test
run: |
2 changes: 1 addition & 1 deletion .github/workflows/reusable-smoke-test-images.yml
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/reusable-test-indy.yml
View file
Original file line number Diff line number Diff line change
@@ -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: |
2 changes: 1 addition & 1 deletion .github/workflows/reusable-test-latest-deps.yml
View file
Original file line number Diff line number Diff line change
@@ -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: |
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -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*
1 change: 1 addition & 0 deletions .java-version
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
21