Skip to content

Commit

Permalink
Merge pull request #19414 from famod/temurin
Browse files Browse the repository at this point in the history
Switch to Eclipse Temurin JDK via actions/setup-java
  • Loading branch information
famod authored Aug 16, 2021
2 parents 302633d + dcf6916 commit fe21234
Show file tree
Hide file tree
Showing 11 changed files with 59 additions and 56 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ jobs:
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Get Date
id: get-date
Expand Down Expand Up @@ -287,9 +287,9 @@ jobs:
run: .github/ci-prerequisites.sh

- name: Set up JDK ${{ matrix.java.java-version }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: ${{ matrix.java.java-version }}

- name: Download Maven Repo
Expand Down Expand Up @@ -363,9 +363,9 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up JDK ${{ matrix.java.java-version }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: ${{ matrix.java.java-version }}
- name: Build
# Important: keep -pl ... in sync with "Calculate run flags"!
Expand Down Expand Up @@ -425,9 +425,9 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up JDK ${{ matrix.java.java-version }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: ${{ matrix.java.java-version }}
- name: Verify dependencies
# runs on Windows as well but would require newline conversion, not worth it
Expand Down Expand Up @@ -481,9 +481,9 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up JDK ${{ matrix.java.java-version }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: ${{ matrix.java.java-version }}
- name: Build
# Important: keep -pl ... in sync with "Calculate run flags"!
Expand Down Expand Up @@ -526,9 +526,9 @@ jobs:
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Download Maven Repo
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -586,9 +586,9 @@ jobs:
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Install cl.exe
if: startsWith(matrix.os-name, 'windows')
Expand Down
45 changes: 22 additions & 23 deletions .github/workflows/ci-actions.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ jobs:
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Get Date
id: get-date
Expand Down Expand Up @@ -162,11 +162,10 @@ jobs:
run: .github/ci-prerequisites.sh

- name: Set up JDK ${{ matrix.java.name }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: ${{ matrix.java.java-version }}
release: ${{ matrix.java.release }}

- name: Download Maven Repo
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -202,9 +201,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Download Maven Repo
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -256,9 +255,9 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up JDK ${{ matrix.java.name }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: ${{ matrix.java.java-version }}
- name: Run Maven integration tests
run: eval ./mvnw $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven'
Expand Down Expand Up @@ -293,9 +292,9 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Run Maven integration tests
shell: bash
Expand Down Expand Up @@ -337,9 +336,9 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up JDK ${{ matrix.java.name }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: ${{ matrix.java.java-version }}
- name: Build with Gradle
uses: eskatos/gradle-command-action@v1
Expand All @@ -361,9 +360,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Download Maven Repo
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -410,9 +409,9 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up JDK ${{ matrix.java.name }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: ${{ matrix.java.java-version }}
- name: Run Devtools integration tests
run: eval ./mvnw $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools'
Expand Down Expand Up @@ -447,9 +446,9 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Run Devtools integration tests
shell: bash
Expand Down Expand Up @@ -486,9 +485,9 @@ jobs:
run: .github/ci-prerequisites.sh
working-directory: ./tcks
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Download Maven Repo
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -545,9 +544,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-fork-mvn-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Get Date
id: get-date
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 1
ref: main
fetch-depth: 1
ref: main
- name: Setup Java JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
java-version: 11
distribution: temurin
java-version: 11

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Get Date
id: get-date
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Get Date
id: get-date
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/jdk-early-access-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ jobs:

- name: Set up JDK
# AdoptOpenJDK does not seem to provide EA builds, so use the standard action which provides a Zulu JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: ${{ env.JDK_VERSION }}
- name: Print Java version
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/native-cron-build.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ jobs:
run: docker pull quay.io/quarkus/ubi-quarkus-native-image:20.2.0-java${{ matrix.java }}

- name: Set up JDK ${{ matrix.java }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
if: matrix.java != '8'
with:
distribution: temurin
java-version: ${{ matrix.java }}

- name: Set up JDK ${{ matrix.java }}
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
if: matrix.java == '8'
with:
distribution: temurin
java-version: ${{ matrix.java }}
# stay on a version before 252 for now because it breaks ALPN handling
release: jdk8u242-b08
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Create maven repo
run: mkdir -p $HOME/release/repository
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Get Date
id: get-date
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sonarcloud.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- name: Get Date
id: get-date
Expand Down

0 comments on commit fe21234

Please sign in to comment.