Skip to content

Commit

Permalink
Merge #3864 into 3.7.0-M6
Browse files Browse the repository at this point in the history
  • Loading branch information
chemicL committed Aug 26, 2024
2 parents 93cce63 + 8235a00 commit 3d38ac8
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -81,19 +81,19 @@ jobs:
shell: bash
- name: Setup Java 9
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup Java 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup Java 8
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ jobs:
shell: bash
- name: Setup Java 9
if: contains('main 3.6.x', matrix.branch)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup Java 21
if: contains('main 3.6.x', matrix.branch)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup Java 8
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -113,19 +113,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -156,19 +156,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -201,19 +201,19 @@ jobs:
shell: bash
- name: Setup JDK 9
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ jobs:
shell: bash
- name: Setup Java 9
if: contains('main 3.6.x', matrix.branch)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup Java 21
if: contains('main 3.6.x', matrix.branch)
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup Java 8
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down

0 comments on commit 3d38ac8

Please sign in to comment.