You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/07/09 00:58:08 UTC
(grails-core) branch 8.0.x updated (66475c356a -> 05f71e6624)
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from 66475c356a Merge pull request #15841 from apache/hibernateProxyFix
add 6daf2d1903 Adjust caching so we do not overload the 10 gig limit that GitHub provides
add 9e381f5c41 Pin upload/download artifacts to same version
add c3ba64122a Merge branch '7.0.x' into ci/branch-keyed-dependency-cache
add 71208cf975 Fix nonexistent download-artifact v7.0.1 tag in groovy joint workflow
add 72529bcdf0 Merge pull request #15935 from apache/ci/branch-keyed-dependency-cache
add efeae71f73 Merge branch '7.0.x' into 7.1.x
add 057424f529 Merge branch '7.1.x' into 7.2.x
new 05f71e6624 Merge branch '7.2.x' into 8.0.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/gradle.yml | 154 ++++++++++++++++++++++++++--
.github/workflows/groovy-joint-workflow.yml | 28 ++---
2 files changed, 157 insertions(+), 25 deletions(-)
(grails-core) 01/01: Merge branch '7.2.x' into 8.0.x
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 05f71e6624f9681192d9f866b800e7003e001f18
Merge: 66475c356a 057424f529
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Jul 8 20:58:01 2026 -0400
Merge branch '7.2.x' into 8.0.x
# Conflicts:
# .github/workflows/gradle.yml
# .github/workflows/groovy-joint-workflow.yml
.github/workflows/gradle.yml | 154 ++++++++++++++++++++++++++--
.github/workflows/groovy-joint-workflow.yml | 28 ++---
2 files changed, 157 insertions(+), 25 deletions(-)
diff --cc .github/workflows/gradle.yml
index 3e5bb8b04f,2f48e1b78b..bc68df3790
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@@ -35,7 -35,18 +35,18 @@@ jobs
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: liberica
- java-version: 17
+ java-version: 21
+ - name: "🗄️ Restore dependency jar cache"
+ uses: actions/cache@v4
+ with:
+ # Cache only downloaded dependency jars and wrapper distributions, never Grails build outputs.
+ # Keyed by branch version so each release branch maintains its own warm cache.
+ path: |
+ ~/.gradle/caches/modules-2
+ ~/.gradle/wrapper
+ key: gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-${{ hashFiles('**/dependencies.gradle', '**/gradle-wrapper.properties') }}
+ restore-keys: |
+ gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-
- name: "🐘 Setup Gradle"
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
with:
@@@ -538,7 -571,18 +626,18 @@@
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: liberica
- java-version: 17
+ java-version: 21
+ - name: "🗄️ Restore dependency jar cache"
+ uses: actions/cache@v4
+ with:
+ # Cache only downloaded dependency jars and wrapper distributions, never Grails build outputs.
+ # Keyed by branch version so each release branch maintains its own warm cache.
+ path: |
+ ~/.gradle/caches/modules-2
+ ~/.gradle/wrapper
+ key: gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-${{ hashFiles('**/dependencies.gradle', '**/gradle-wrapper.properties') }}
+ restore-keys: |
+ gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-
- name: "🐘 Setup Gradle"
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
with:
@@@ -593,7 -636,18 +692,18 @@@
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: liberica
- java-version: 17
+ java-version: 21
+ - name: "🗄️ Restore dependency jar cache"
+ uses: actions/cache@v4
+ with:
+ # Cache only downloaded dependency jars and wrapper distributions, never Grails build outputs.
+ # Keyed by branch version so each release branch maintains its own warm cache.
+ path: |
+ ~/.gradle/caches/modules-2
+ ~/.gradle/wrapper
+ key: gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-${{ hashFiles('**/dependencies.gradle', '**/gradle-wrapper.properties') }}
+ restore-keys: |
+ gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-
- name: "🐘 Setup Gradle"
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
with:
@@@ -700,7 -702,18 +810,18 @@@
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: liberica
- java-version: 17
+ java-version: 21
+ - name: "🗄️ Restore dependency jar cache"
+ uses: actions/cache@v4
+ with:
+ # Cache only downloaded dependency jars and wrapper distributions, never Grails build outputs.
+ # Keyed by branch version so each release branch maintains its own warm cache.
+ path: |
+ ~/.gradle/caches/modules-2
+ ~/.gradle/wrapper
+ key: gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-${{ hashFiles('**/dependencies.gradle', '**/gradle-wrapper.properties') }}
+ restore-keys: |
+ gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-
- name: "🐘 Setup Gradle"
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
with:
@@@ -800,7 -813,18 +921,18 @@@
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: liberica
- java-version: 17
+ java-version: 21
+ - name: "🗄️ Restore dependency jar cache"
+ uses: actions/cache@v4
+ with:
+ # Cache only downloaded dependency jars and wrapper distributions, never Grails build outputs.
+ # Keyed by branch version so each release branch maintains its own warm cache.
+ path: |
+ ~/.gradle/caches/modules-2
+ ~/.gradle/wrapper
+ key: gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-${{ hashFiles('**/dependencies.gradle', '**/gradle-wrapper.properties') }}
+ restore-keys: |
+ gradle-deps-${{ runner.os }}-${{ github.base_ref || github.ref_name }}-
- name: "🐘 Setup Gradle"
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
with:
diff --cc .github/workflows/groovy-joint-workflow.yml
index 2c3391b5cb,7bd1951872..91aac211e1
--- a/.github/workflows/groovy-joint-workflow.yml
+++ b/.github/workflows/groovy-joint-workflow.yml
@@@ -17,12 -17,10 +17,10 @@@ name: "CI - Groovy Joint Validation Bui
on:
push:
branches:
- - '[4-9]+.[0-9]+.x'
+ - '[0-9]+.[0-9]+.x'
- - '8.0.x-hibernate7.*'
pull_request:
branches:
- - '[4-9]+.[0-9]+.x'
+ - '[0-9]+.[0-9]+.x'
- - '8.0.x-hibernate7.*'
workflow_dispatch:
# queue jobs and only allow 1 run per branch due to the likelihood of hitting GitHub resource limits
concurrency:
@@@ -40,22 -38,9 +38,17 @@@ jobs
- name: "☕️ Setup JDK"
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
- java-version: 17
+ java-version: 21
distribution: liberica
- - name: "🗄️ Cache local Maven repository"
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
- with:
- path: ~/.m2/repository
- key: cache-local-maven-${{ github.sha }}
- - name: "📥 Checkout Grails Core files needed for the Groovy joint-build"
+ - name: "📥 Checkout Grails Core to fetch Gradle Plugin versions it uses"
+ # Sparse-checkout fetches only the two paths this job actually needs:
+ # - dependencies.gradle: parsed below to derive the matching Apache
+ # Groovy branch (GROOVY_<major>_0_X) for this Grails branch.
+ # - .github/scripts/groovy-joint-build.init.gradle: passed to
+ # ./gradlew --init-script when publishing Groovy to local Maven so
+ # the joint build reuses our Develocity / build-cache settings.
+ # Both paths must be listed here; otherwise the init-script step fails
+ # with "The specified initialization script ... does not exist."
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
sparse-checkout-cone-mode: false
@@@ -98,8 -74,59 +91,15 @@@
- name: "🔨 Publish Groovy to local maven repository (no docs)"
run: |
cd groovy
- ./gradlew pTML -x groovydoc -x javadoc -x javadocAll -x groovydocAll -x asciidoc -x docGDK
+ ./gradlew pTML -x groovydoc -x javadoc -x javadocAll -x groovydocAll -x asciidoc -x docGDK \
+ --init-script $GITHUB_WORKSPACE/.github/scripts/groovy-joint-build.init.gradle
+ - name: "📤 Share locally built Groovy artifacts with the build_grails job"
+ uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+ with:
+ name: local-groovy-maven-repo
+ path: ~/.m2/repository/org/apache/groovy/
+ if-no-files-found: 'error'
+ retention-days: 1
-
build_grails:
needs: [build_groovy]
runs-on: ubuntu-latest