Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit 4ed4abc

Browse files
authored
Merge pull request #877 from grails/8.1.x
Merge 8.1.x into 9.0.x
2 parents 679fb59 + d9ffb0d commit 4ed4abc

File tree

14 files changed

+307
-72
lines changed

14 files changed

+307
-72
lines changed

.github/release-drafter.yml

Lines changed: 90 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,108 @@
11
name-template: $RESOLVED_VERSION
22
tag-template: v$RESOLVED_VERSION
3+
pull-request:
4+
title-templates:
5+
fix: '🐛 $TITLE (#$NUMBER)'
6+
feat: '🚀 $TITLE (#$NUMBER)'
7+
default: '$TITLE (#$NUMBER)'
8+
autolabeler:
9+
- label: 'bug'
10+
branch:
11+
- '/fix\/.+/'
12+
title:
13+
- '/fix/i'
14+
- label: 'feature'
15+
branch:
16+
- '/feature\/.+/'
17+
title:
18+
- '/feat/i'
19+
- label: 'documentation'
20+
branch:
21+
- '/docs\/.+/'
22+
title:
23+
- '/docs/i'
24+
- label: 'maintenance'
25+
branch:
26+
- '/(chore|refactor|style|test|ci|perf|build)\/.+/'
27+
title:
28+
- '/(chore|refactor|style|test|ci|perf|build)/i'
29+
- label: 'chore'
30+
branch:
31+
- '/chore\/.+/'
32+
title:
33+
- '/chore/i'
34+
- label: 'refactor'
35+
branch:
36+
- '/refactor\/.+/'
37+
title:
38+
- '/refactor/i'
39+
- label: 'style'
40+
branch:
41+
- '/style\/.+/'
42+
title:
43+
- '/style/i'
44+
- label: 'test'
45+
branch:
46+
- '/test\/.+/'
47+
title:
48+
- '/test/i'
49+
- label: 'ci'
50+
branch:
51+
- '/ci\/.+/'
52+
title:
53+
- '/ci/i'
54+
- label: 'perf'
55+
branch:
56+
- '/perf\/.+/'
57+
title:
58+
- '/perf/i'
59+
- label: 'build'
60+
branch:
61+
- '/build\/.+/'
62+
title:
63+
- '/build/i'
64+
- label: 'deps'
65+
branch:
66+
- '/deps\/.+/'
67+
title:
68+
- '/deps/i'
69+
- label: 'revert'
70+
branch:
71+
- '/revert\/.+/'
72+
title:
73+
- '/revert/i'
374
categories:
4-
- title: Features
75+
- title: '🚀 Features'
576
labels:
77+
- 'feat'
678
- "type: enhancement"
779
- "type: new feature"
880
- "type: major"
9-
- title: 🐛 Bug Fixes/Improvements
81+
- title: '🐛 Bug Fixes'
1082
labels:
83+
- 'fix'
84+
- 'bug'
1185
- "type: improvement"
1286
- "type: bug"
1387
- "type: minor"
14-
- title: 🛠 Dependency upgrades
88+
- title: '📚 Documentation'
1589
labels:
16-
- "type: dependency upgrade"
17-
- "dependencies"
18-
- title: ⚙️ Build/CI
90+
- 'docs'
91+
- title: '🔧 Maintenance'
1992
labels:
93+
- 'maintenance'
94+
- 'chore'
95+
- 'refactor'
96+
- 'style'
97+
- 'test'
98+
- 'ci'
99+
- 'perf'
100+
- 'build'
20101
- "type: ci"
21102
- "type: build"
103+
- title: '⏪ Reverts'
104+
labels:
105+
- 'revert'
22106
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
23107
version-resolver:
24108
major:
@@ -31,8 +115,6 @@ version-resolver:
31115
labels:
32116
- 'type: patch'
33117
default: patch
34-
commitsh: $BASE_REF_NAME
35-
filter-by-commitsh: true
36118
template: |
37119
## What's Changed
38120

.github/workflows/docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ jobs:
1313
java: ['11']
1414
env:
1515
GIT_USER_NAME: puneetbehl
16-
GIT_USER_EMAIL: behlp@objectcomputing.com
16+
GIT_USER_EMAIL: behlp@unityfoundation.io
1717
steps:
1818
- name: Checkout repository
1919
uses: actions/checkout@v4
2020
with:
2121
token: ${{ secrets.GH_TOKEN }}
2222
ref: ${{github.event.inputs.ref}}
2323
- name: Set up JDK
24-
uses: actions/setup-java@v3
24+
uses: actions/setup-java@v4
2525
with:
2626
distribution: 'adopt'
2727
java-version: ${{ matrix.java }}
2828
- name: Publish Documentation
2929
id: docs
30-
uses: gradle/gradle-build-action@v2
30+
uses: gradle/gradle-build-action@v3
3131
env:
3232
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3333
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
@@ -53,6 +53,6 @@ jobs:
5353
FOLDER: docs/build/docs
5454
DOC_SUB_FOLDER: hibernate
5555
DOC_FOLDER: gh-pages
56-
COMMIT_EMAIL: behlp@objectcomputing.com
56+
COMMIT_EMAIL: behlp@unityfoundation.io
5757
COMMIT_NAME: Puneet Behl
5858
VERSION: ${{ steps.release_version.outputs.release_version }}

.github/workflows/gradle.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Set up JDK
19-
uses: actions/setup-java@v3
19+
uses: actions/setup-java@v4
2020
with:
2121
distribution: 'adopt'
2222
java-version: '11'
2323
- name: Run Build
2424
id: build
25-
uses: gradle/gradle-build-action@v2
25+
uses: gradle/gradle-build-action@v3
2626
env:
2727
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
2828
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
@@ -36,12 +36,12 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@v4
3838
- name: Set up JDK
39-
uses: actions/setup-java@v3
39+
uses: actions/setup-java@v4
4040
with:
4141
distribution: 'adopt'
4242
java-version: '11'
4343
- name: Publish Artifacts To Grails Artifactory (repo.grails.org)
44-
uses: gradle/gradle-build-action@v2
44+
uses: gradle/gradle-build-action@v3
4545
env:
4646
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4747
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
@@ -52,7 +52,7 @@ jobs:
5252
arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish
5353
- name: Build Docs
5454
if: success()
55-
uses: gradle/gradle-build-action@v2
55+
uses: gradle/gradle-build-action@v3
5656
env:
5757
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
5858
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
@@ -78,5 +78,5 @@ jobs:
7878
FOLDER: docs/build/docs
7979
DOC_SUB_FOLDER: hibernate
8080
DOC_FOLDER: gh-pages
81-
COMMIT_EMAIL: behlp@objectcomputing.com
81+
COMMIT_EMAIL: behlp@unityfoundation.io
8282
COMMIT_NAME: Puneet Behl
Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: "Grails Joint Validation Build"
17+
# GROOVY_2_5_X == Grails 4.0.x
18+
# GROOVY_3_0_X == grails master
19+
# Groovy master branch does not map to any due to changed package names.
20+
on:
21+
push:
22+
branches:
23+
- '[8-9]+.[0-9]+.x'
24+
pull_request:
25+
branches:
26+
- '[8-9]+.[0-9]+.x'
27+
workflow_dispatch:
28+
permissions:
29+
contents: read
30+
env:
31+
CI_GROOVY_VERSION:
32+
jobs:
33+
build_groovy:
34+
strategy:
35+
fail-fast: true
36+
runs-on: ubuntu-latest
37+
outputs:
38+
groovyVersion: ${{ steps.groovy-version.outputs.value }}
39+
steps:
40+
- name: Set up JDK
41+
uses: actions/setup-java@v4
42+
with:
43+
distribution: 'adopt'
44+
java-version: '11.0.6'
45+
- name: Cache local Maven repository & Groovy
46+
uses: actions/cache@v4
47+
with:
48+
path: |
49+
~/groovy
50+
~/.m2/repository
51+
key: cache-local-groovy-maven-${{ github.sha }}
52+
- name: Checkout Groovy 3_0_X (Grails 5 and later)
53+
if: startsWith(github.ref, 'refs/heads/8.') || startsWith(github.base_ref, '8.')
54+
run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_3_0_X --single-branch
55+
- name: Set CI_GROOVY_VERSION for Grails
56+
id: groovy-version
57+
run: |
58+
cd ../groovy
59+
echo "CI_GROOVY_VERSION=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_ENV
60+
echo "value=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_OUTPUT
61+
- name: Prepare GE Set-up Configuration
62+
id: ge_conf
63+
run: |
64+
echo "VALUE<<EOF" >> $GITHUB_OUTPUT
65+
echo "plugins { " >> $GITHUB_OUTPUT
66+
echo " id 'com.gradle.enterprise' version '3.15.1'" >> $GITHUB_OUTPUT
67+
echo " id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'" >> $GITHUB_OUTPUT
68+
echo "}" >> $GITHUB_OUTPUT
69+
echo "" >> $GITHUB_OUTPUT
70+
echo "gradleEnterprise {" >> $GITHUB_OUTPUT
71+
echo " server = 'https://ge.grails.org'" >> $GITHUB_OUTPUT
72+
echo " buildScan {" >> $GITHUB_OUTPUT
73+
echo " publishAlways()" >> $GITHUB_OUTPUT
74+
echo " publishIfAuthenticated()" >> $GITHUB_OUTPUT
75+
echo " uploadInBackground = System.getenv('CI') == null" >> $GITHUB_OUTPUT
76+
echo " capture {" >> $GITHUB_OUTPUT
77+
echo " taskInputFiles = true" >> $GITHUB_OUTPUT
78+
echo " }" >> $GITHUB_OUTPUT
79+
echo " }" >> $GITHUB_OUTPUT
80+
echo "}" >> $GITHUB_OUTPUT
81+
echo "" >> $GITHUB_OUTPUT
82+
echo "buildCache {" >> $GITHUB_OUTPUT
83+
echo " local { enabled = System.getenv('CI') != 'true' }" >> $GITHUB_OUTPUT
84+
echo " remote(HttpBuildCache) {" >> $GITHUB_OUTPUT
85+
echo " push = System.getenv('CI') == 'true'" >> $GITHUB_OUTPUT
86+
echo " enabled = true" >> $GITHUB_OUTPUT
87+
echo " url = 'https://ge.grails.org/cache/'" >> $GITHUB_OUTPUT
88+
echo " credentials {" >> $GITHUB_OUTPUT
89+
echo " username = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER')" >> $GITHUB_OUTPUT
90+
echo " password = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')" >> $GITHUB_OUTPUT
91+
echo " }" >> $GITHUB_OUTPUT
92+
echo " }" >> $GITHUB_OUTPUT
93+
echo "}" >> $GITHUB_OUTPUT
94+
echo "" >> $GITHUB_OUTPUT
95+
echo "EOF" >> $GITHUB_OUTPUT
96+
- name: Gradle Enterprise Set-up
97+
run: |
98+
cd ../groovy
99+
# Delete exiting plugins and build-scan from settings.gradle file
100+
sed -i '21,31d' settings.gradle
101+
# Add Gradle Enterprise set-up related configuration after line no 20 in settings.gradle
102+
echo "${{ steps.ge_conf.outputs.value}}" | sed -i -e "20r /dev/stdin" settings.gradle
103+
- name: Build and install groovy (no docs)
104+
uses: gradle/gradle-build-action@v3
105+
env:
106+
GRADLE_SCANS_ACCEPT: yes
107+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
108+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
109+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
110+
with:
111+
build-root-directory: ../groovy
112+
arguments: |
113+
install
114+
-x groovydoc
115+
-x javadoc
116+
-x javadocAll
117+
-x groovydocAll
118+
-x asciidoc
119+
-x docGDK
120+
build_gorm_hibernate5:
121+
needs: [build_groovy]
122+
strategy:
123+
fail-fast: true
124+
runs-on: ubuntu-latest
125+
steps:
126+
- uses: actions/checkout@v4
127+
- name: Set up JDK
128+
uses: actions/setup-java@v4
129+
with:
130+
distribution: 'adopt'
131+
java-version: '11'
132+
- name: Cache local Maven repository & Groovy
133+
uses: actions/cache@v4
134+
with:
135+
path: |
136+
~/groovy
137+
~/.m2/repository
138+
key: cache-local-groovy-maven-${{ github.sha }}
139+
- name: Set CI_GROOVY_VERSION for Grails
140+
run: |
141+
echo "CI_GROOVY_VERSION=${{needs.build_groovy.outputs.groovyVersion}}" >> $GITHUB_ENV
142+
- name: Build GORM Hibernate5
143+
id: build_gorm_hibernate5
144+
uses: gradle/gradle-build-action@v3
145+
env:
146+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
147+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
148+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
149+
with:
150+
arguments: |
151+
build
152+
-x groovydoc

.github/workflows/release-notes.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ on:
44
types: [closed,reopened]
55
push:
66
branches:
7-
- master
87
- '[7-9]+.[0-9]+.x'
8+
pull_request:
9+
types: [opened, reopened, synchronize]
10+
pull_request_target:
11+
types: [opened, reopened, synchronize]
912
workflow_dispatch:
1013
jobs:
1114
release_notes:
@@ -21,12 +24,10 @@ jobs:
2124
id: extract_branch
2225
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
2326
# If it has release drafter:
24-
- uses: release-drafter/release-drafter@v5
27+
- uses: release-drafter/release-drafter@v6
2528
if: steps.check_release_drafter.outputs.has_release_drafter == 'true'
2629
env:
2730
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
28-
with:
29-
commitish: ${{ steps.extract_branch.outputs.value }}
3031
# Otherwise:
3132
- name: Export Gradle Properties
3233
if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
@@ -45,4 +46,4 @@ jobs:
4546
name: ${{ env.title }} ${{ steps.release_notes.outputs.next_version }}
4647
tag: v${{ steps.release_notes.outputs.next_version }}
4748
bodyFile: CHANGELOG.md
48-
token: ${{ secrets.GH_TOKEN }}
49+
token: ${{ secrets.GH_TOKEN }}

0 commit comments

Comments
 (0)