open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: use .java-version (#11323)

This commit is contained in:
Victor Martinez 2024-05-15 16:31:25 +02:00 committed by GitHub
parent d18ccc5a89
commit facdc1826d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/auto-update-otel-sdk.yml vendored
View File

@ -69,7 +69,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

14
.github/workflows/build-common.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@ -68,7 +68,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@ -138,7 +138,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Increase gradle daemon heap size - name: Increase gradle daemon heap size
run: | run: |
@ -220,7 +220,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
# vaadin 14 tests fail with node 18 # vaadin 14 tests fail with node 18
- name: Set up Node - name: Set up Node
@ -335,7 +335,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Set up Gradle cache - name: Set up Gradle cache
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@ -388,7 +388,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@ -411,7 +411,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Set up Gradle cache - name: Set up Gradle cache
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

2
.github/workflows/build.yml vendored
View File

@ -70,7 +70,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

2
.github/workflows/codeql-daily.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5 uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5

2
.github/workflows/owasp-dependency-check-daily.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Increase gradle daemon heap size - name: Increase gradle daemon heap size
run: | run: |

4
.github/workflows/pr-smoke-test-fake-backend-images.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@ -49,7 +49,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

2
.github/workflows/pr-smoke-test-servlet-images.yml vendored
View File

@ -40,7 +40,7 @@ jobs:
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Set up Gradle cache - name: Set up Gradle cache
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

4
.github/workflows/publish-smoke-test-fake-backend-images.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Login to GitHub package registry - name: Login to GitHub package registry
uses: docker/login-action@v3 uses: docker/login-action@v3
@ -55,7 +55,7 @@ jobs:
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Login to GitHub package registry - name: Login to GitHub package registry
uses: azure/docker-login@v1 uses: azure/docker-login@v1

2
.github/workflows/publish-smoke-test-servlet-images.yml vendored
View File

@ -57,7 +57,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Login to GitHub package registry - name: Login to GitHub package registry
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0

2
.github/workflows/release.yml vendored
View File

@ -83,7 +83,7 @@ jobs:
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

2
.github/workflows/reusable-muzzle.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

4
.github/workflows/reusable-native-tests.yml vendored
View File

@ -13,10 +13,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - 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 - uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1.1
with: with:
version: "latest" version: "latest"
java-version: "21" java-version: "${{ steps.read-java.outputs.version }}"
components: "native-image" components: "native-image"
- name: Running test - name: Running test
env: env:

2
.github/workflows/reusable-smoke-test-images.yml vendored
View File

@ -47,7 +47,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Login to GitHub package registry - name: Login to GitHub package registry
if: inputs.publish if: inputs.publish

2
.github/workflows/reusable-test-indy.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Increase gradle daemon heap size - name: Increase gradle daemon heap size
run: | run: |

2
.github/workflows/reusable-test-latest-deps.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with: with:
distribution: temurin distribution: temurin
java-version: 21 java-version-file: .java-version
- name: Increase gradle daemon heap size - name: Increase gradle daemon heap size
run: | run: |

1
.gitignore vendored
View File

@ -54,7 +54,6 @@ out/
/workspace /workspace
java-agent/benchmark-integration/perf-test-settings.rc java-agent/benchmark-integration/perf-test-settings.rc
derby.log derby.log
.java-version
hs_err_pid* hs_err_pid*
replay_pid* replay_pid*
.attach_pid* .attach_pid*

1
.java-version Normal file
View File

@ -0,0 +1 @@
21