Update CI to use Java 23 GA

Closes gh-42345
spring-projects · Sep 18, 2024 · 6d8a421 · 6d8a421
1 parent ef5bc91
commit 6d8a421
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -13,6 +13,10 @@ inputs:
  required: false
  default: 'false'
  description: 'Whether a Java toolchain should be used'
+ java-distribution:
+ required: false
+ default: 'liberica'
+ description: 'The distribution of Java to use'
  publish:
  required: false
  default: 'false'
@@ -37,6 +41,7 @@ runs:
  java-version: ${{ inputs.java-version }}
  java-early-access: ${{ inputs.java-early-access }}
  java-toolchain: ${{ inputs.java-toolchain }}
+ java-distribution: ${{ inputs.java-distribution }}
  - name: Build
  id: build
  if: ${{ inputs.publish == 'false' }}

diff --git a/.github/actions/prepare-gradle-build/action.yml b/.github/actions/prepare-gradle-build/action.yml
@@ -8,11 +8,15 @@ inputs:
  java-early-access:
  required: false
  default: 'false'
- description: 'Whether the Java version is in early access'
+ description: 'Whether the Java version is in early access. When true, forces java-distribution to temurin'
  java-toolchain:
  required: false
  default: 'false'
  description: 'Whether a Java toolchain should be used'
+ java-distribution:
+ required: false
+ default: 'liberica'
+ description: 'The distribution of Java to use'
  develocity-access-key:
  required: false
  description: 'The access key for authentication with ge.spring.io'
@@ -27,7 +31,7 @@ runs:
  - name: Set Up Java
  uses: actions/setup-java@v4
  with:
- distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || 'liberica' }}
+ distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || inputs.java-distribution }}
  java-version: |
  ${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
  ${{ inputs.java-toolchain == 'true' && '17' || '' }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
  - version: 22
  toolchain: true
  - version: 23
- early-access: true
+ distribution: oracle
  toolchain: true
  exclude:
  - os:
@@ -49,6 +49,7 @@ jobs:
  java-version: ${{ matrix.java.version }}
  java-early-access: ${{ matrix.java.early-access || 'false' }}
  java-toolchain: ${{ matrix.java.toolchain }}
+ java-distribution: ${{ matrix.java.distribution }}
  develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
  - name: Send Notification
  uses: ./.github/actions/send-notification