Skip to content

Commit

Permalink
Merge #3895 into 3.7.0-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
chemicL committed Oct 3, 2024
2 parents 4d872c1 + 7cc8c5f commit 9530d68
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -79,19 +79,19 @@ jobs:
shell: bash
- name: Setup Java 9
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup Java 8
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup Java 8
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down
26 changes: 13 additions & 13 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Install asciidoctor-pdf / rouge
run: gem install asciidoctor-pdf rouge
- name: Setup java 21 for antora
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4
with:
distribution: 'temurin'
java-version: '21'
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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 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@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup Java 8
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # tag=v3
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down

0 comments on commit 9530d68

Please sign in to comment.