This is an automated email from the ASF dual-hosted git repository. emilles pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0db2fa31d2091a0006393d676ad0982def5de15e Author: Eric Milles <[email protected]> AuthorDate: Fri Sep 19 08:47:51 2025 -0500 Java 25 is LTS now (not EA) --- .github/workflows/groovy-build-coverage.yml | 8 ++--- .github/workflows/groovy-build-dist.yml | 10 +++--- .github/workflows/groovy-build-test-ea.yml | 49 ----------------------------- .github/workflows/groovy-build-test.yml | 20 ++++++------ 4 files changed, 19 insertions(+), 68 deletions(-) diff --git a/.github/workflows/groovy-build-coverage.yml b/.github/workflows/groovy-build-coverage.yml index 1ad9d7dd22..97cbe31f7d 100644 --- a/.github/workflows/groovy-build-coverage.yml +++ b/.github/workflows/groovy-build-coverage.yml @@ -25,18 +25,16 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] - java: [17] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 + - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: ${{ matrix.java }} + java-version: 17 check-latest: true - uses: gradle/gradle-build-action@v2 - name: Test with Gradle diff --git a/.github/workflows/groovy-build-dist.yml b/.github/workflows/groovy-build-dist.yml index 42ec254cde..93a3889086 100644 --- a/.github/workflows/groovy-build-dist.yml +++ b/.github/workflows/groovy-build-dist.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Generate SNAPSHOT +name: Generate SNAPSHOT distributions on: [push, pull_request] @@ -23,18 +23,18 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v3 + - name: Install graphviz + run: sudo apt-get install -y graphviz - name: Set up JDK uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 check-latest: true + - uses: actions/checkout@v3 - uses: gradle/gradle-build-action@v2 - - name: Install graphviz - run: sudo apt-get install -y graphviz - name: Build and package - run: ./gradlew clean dist --no-build-cache --no-scan --refresh-dependencies + run: ./gradlew clean dist --no-build-cache --no-daemon --no-scan --refresh-dependencies timeout-minutes: 60 - name: Move binary distribution run: mkdir -p build/distributions/binary/ && mv subprojects/groovy-binary/build/distributions/apache-groovy-binary-*.zip build/distributions/binary/ diff --git a/.github/workflows/groovy-build-test-ea.yml b/.github/workflows/groovy-build-test-ea.yml deleted file mode 100644 index 49d0d7f309..0000000000 --- a/.github/workflows/groovy-build-test-ea.yml +++ /dev/null @@ -1,49 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: Build and test ea - -on: [push, pull_request] - -permissions: - contents: read - -jobs: - test: - 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 }} - env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - 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@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - check-latest: true - java-version: 17 - - uses: gradle/gradle-build-action@v2 - - name: Test with Gradle - run: ./gradlew test -Ptarget.java.home=/home/runner/openjdk - timeout-minutes: 60 diff --git a/.github/workflows/groovy-build-test.yml b/.github/workflows/groovy-build-test.yml index 72cb68a5b5..fb7d169ae5 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: - java: [8, 11, 17, 21] + java: [8, 11, 17, 21, 25] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: ${{ matrix.java }} + java-version: | + ${{ matrix.java }} + 17 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 @@ -57,13 +58,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: ${{ matrix.java }} + java-version: | + ${{ matrix.java }} + 17 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
