This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 75d8c8461d Java 25 is LTS now (not EA)
75d8c8461d is described below
commit 75d8c8461d06edafeb3f73292216b52497cf8d4d
Author: Eric Milles <[email protected]>
AuthorDate: Thu Sep 18 12:32:53 2025 -0500
Java 25 is LTS now (not EA)
---
.github/workflows/groovy-build-coverage.yml | 5 +--
.github/workflows/groovy-build-test.yml | 53 ++++++-----------------------
2 files changed, 12 insertions(+), 46 deletions(-)
diff --git a/.github/workflows/groovy-build-coverage.yml
b/.github/workflows/groovy-build-coverage.yml
index 47ed033f7a..c335b7e686 100644
--- a/.github/workflows/groovy-build-coverage.yml
+++ b/.github/workflows/groovy-build-coverage.yml
@@ -24,9 +24,7 @@ jobs:
test:
strategy:
fail-fast: false
- matrix:
- os: [ubuntu-latest]
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
@@ -45,4 +43,3 @@ jobs:
with:
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true
-
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index e30c47ade5..79b94a90c3 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -28,19 +28,20 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [ubuntu-latest]
- java: [17, 21]
- runs-on: ${{ matrix.os }}
+ java: [17, 21, 25]
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
with:
distribution: 'zulu'
- java-version: ${{ matrix.java }}
+ java-version: |
+ ${{ matrix.java }}
+ 21
check-latest: true
- uses: gradle/actions/setup-gradle@v4
- name: Test with Gradle
- run: ./gradlew test
+ run: ./gradlew test -Ptarget.java.home="$JAVA_HOME_${{ matrix.java
}}_X64"
timeout-minutes: 60
- name: Upload reports
uses: actions/upload-artifact@v4
@@ -50,53 +51,21 @@ jobs:
path: '**/build/reports/'
additional:
- #if: github.event_name == 'push'
strategy:
fail-fast: false
matrix:
- os: [ubuntu-latest]
java: [18, 19, 20, 22, 23, 24]
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
with:
distribution: 'zulu'
- java-version: ${{ matrix.java }}
+ java-version: |
+ ${{ matrix.java }}
+ 21
check-latest: true
- uses: gradle/actions/setup-gradle@v4
- name: Test with Gradle
- run: ./gradlew test
+ run: ./gradlew test -Ptarget.java.home="$JAVA_HOME_${{ matrix.java
}}_X64"
timeout-minutes: 60
-
- ea:
- #if: github.event_name == 'push'
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-latest]
- # The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
- jdk:
- -
"https://download.java.net/java/early_access/jdk25/15/GPL/openjdk-25-ea+15_linux-x64_bin.tar.gz";
- runs-on: ${{ matrix.os }}
- steps:
- - name: Download JDK ${{ matrix.jdk }}
- run: wget -c ${{ matrix.jdk }} -O /tmp/openjdk.tar.gz
- - name: Set up JDK ${{ matrix.jdk }}
- run: mkdir -p /home/runner/openjdk && tar -xvf /tmp/openjdk.tar.gz -C
/home/runner/openjdk && chmod -R 755 /home/runner/openjdk && mv
/home/runner/openjdk/jdk*/* /home/runner/openjdk/
- - uses: actions/checkout@v5
- - uses: actions/setup-java@v5
- with:
- distribution: 'zulu'
- java-version: 21
- check-latest: true
- - uses: gradle/actions/setup-gradle@v4
- - name: Test with Gradle
- run: ./gradlew test -Ptarget.java.home=/home/runner/openjdk
- timeout-minutes: 60
- - name: Upload reports
- uses: actions/upload-artifact@v4
- if: always()
- with:
- name: build-reports-ea
- path: '**/build/reports/'
