Skip to content

Commit 0973a3b

Browse files
jamesfredleyjamesfredley
authored
Merge branch '7.0.x' into update-profiles-m1
2 parents 98cf22b + fc14d26 commit 0973a3b

File tree

12 files changed

+698
-91
lines changed

12 files changed

+698
-91
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ on:
1111
workflow_dispatch:
1212
jobs:
1313
build:
14+
outputs:
15+
found_skip_publish: ${{ steps.check_prevent_property.outputs.value }}
1416
permissions:
1517
contents: read # to fetch code (actions/checkout)
1618
strategy:
@@ -21,6 +23,14 @@ jobs:
2123
steps:
2224
- name: "📥 Checkout repository"
2325
uses: actions/checkout@v4
26+
- name: "🔍 Check if we should skip publish"
27+
id: check_prevent_property
28+
run: |
29+
if grep -q '^preventSnapshotPublish=true' gradle.properties; then
30+
echo "value=true" >> $GITHUB_OUTPUT
31+
else
32+
echo "value=false" >> $GITHUB_OUTPUT
33+
fi
2434
- name: "☕️ Setup JDK"
2535
uses: actions/setup-java@v4
2636
with:
@@ -37,7 +47,7 @@ jobs:
3747
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
3848
run: ./gradlew build assemble groovydoc
3949
publish:
40-
if: github.event_name == 'push'
50+
if: github.event_name == 'push' && needs.build.outputs.found_skip_publish != 'true'
4151
needs: build
4252
permissions:
4353
contents: read # limit to read access
@@ -66,7 +76,7 @@ jobs:
6676
-Dorg.gradle.internal.publish.checksums.insecure=true
6777
publish
6878
docs:
69-
if: github.event_name == 'push'
79+
if: github.event_name == 'push' && needs.build.outputs.found_skip_publish != 'true'
7080
needs: publish
7181
runs-on: ubuntu-latest
7282
permissions:

‎.github/workflows/pre-release.yml‎

Lines changed: 327 additions & 0 deletions
Large diffs are not rendered by default.

‎.github/workflows/release.yml‎

Lines changed: 270 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,278 @@ jobs:
1616
GIT_USER_NAME: 'grails-build'
1717
GIT_USER_EMAIL: '[email protected]'
1818
steps:
19+
- name: "💥 Purge Existing Builds - org.grails.grails-bom"
20+
run: |
21+
curl -L \
22+
-X DELETE \
23+
-H "Accept: application/vnd.github+json" \
24+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
25+
-H "X-GitHub-Api-Version: 2022-11-28" \
26+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-bom || true
27+
- name: "💥 Purge Existing Builds - org.grails.grails-bootstrap"
28+
run: |
29+
curl -L \
30+
-X DELETE \
31+
-H "Accept: application/vnd.github+json" \
32+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
33+
-H "X-GitHub-Api-Version: 2022-11-28" \
34+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-bootstrap || true
35+
- name: "💥 Purge Existing Builds - org.grails.grails-codecs"
36+
run: |
37+
curl -L \
38+
-X DELETE \
39+
-H "Accept: application/vnd.github+json" \
40+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
41+
-H "X-GitHub-Api-Version: 2022-11-28" \
42+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-codecs || true
43+
- name: "💥 Purge Existing Builds - org.grails.grails-console"
44+
run: |
45+
curl -L \
46+
-X DELETE \
47+
-H "Accept: application/vnd.github+json" \
48+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
49+
-H "X-GitHub-Api-Version: 2022-11-28" \
50+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-console || true
51+
- name: "💥 Purge Existing Builds - org.grails.grails-dependencies"
52+
run: |
53+
curl -L \
54+
-X DELETE \
55+
-H "Accept: application/vnd.github+json" \
56+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
57+
-H "X-GitHub-Api-Version: 2022-11-28" \
58+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-dependencies || true
59+
- name: "💥 Purge Existing Builds - org.grails.grails-databinding"
60+
run: |
61+
curl -L \
62+
-X DELETE \
63+
-H "Accept: application/vnd.github+json" \
64+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
65+
-H "X-GitHub-Api-Version: 2022-11-28" \
66+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-databinding || true
67+
- name: "💥 Purge Existing Builds - org.grails.grails-docs"
68+
run: |
69+
curl -L \
70+
-X DELETE \
71+
-H "Accept: application/vnd.github+json" \
72+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
73+
-H "X-GitHub-Api-Version: 2022-11-28" \
74+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-docs || true
75+
- name: "💥 Purge Existing Builds - org.grails.grails-core"
76+
run: |
77+
curl -L \
78+
-X DELETE \
79+
-H "Accept: application/vnd.github+json" \
80+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
81+
-H "X-GitHub-Api-Version: 2022-11-28" \
82+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-core || true
83+
- name: "💥 Purge Existing Builds - org.grails.grails-gradle-model"
84+
run: |
85+
curl -L \
86+
-X DELETE \
87+
-H "Accept: application/vnd.github+json" \
88+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
89+
-H "X-GitHub-Api-Version: 2022-11-28" \
90+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-gradle-model || true
91+
- name: "💥 Purge Existing Builds - org.grails.grails-encoder"
92+
run: |
93+
curl -L \
94+
-X DELETE \
95+
-H "Accept: application/vnd.github+json" \
96+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
97+
-H "X-GitHub-Api-Version: 2022-11-28" \
98+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-encoder || true
99+
- name: "💥 Purge Existing Builds - org.grails.grails-logging"
100+
run: |
101+
curl -L \
102+
-X DELETE \
103+
-H "Accept: application/vnd.github+json" \
104+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
105+
-H "X-GitHub-Api-Version: 2022-11-28" \
106+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-logging || true
107+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-controllers"
108+
run: |
109+
curl -L \
110+
-X DELETE \
111+
-H "Accept: application/vnd.github+json" \
112+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
113+
-H "X-GitHub-Api-Version: 2022-11-28" \
114+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-controllers || true
115+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-codecs"
116+
run: |
117+
curl -L \
118+
-X DELETE \
119+
-H "Accept: application/vnd.github+json" \
120+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
121+
-H "X-GitHub-Api-Version: 2022-11-28" \
122+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-codecs || true
123+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-databinding"
124+
run: |
125+
curl -L \
126+
-X DELETE \
127+
-H "Accept: application/vnd.github+json" \
128+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
129+
-H "X-GitHub-Api-Version: 2022-11-28" \
130+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-databinding || true
131+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-datasource"
132+
run: |
133+
curl -L \
134+
-X DELETE \
135+
-H "Accept: application/vnd.github+json" \
136+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
137+
-H "X-GitHub-Api-Version: 2022-11-28" \
138+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-datasource || true
139+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-domain-class"
140+
run: |
141+
curl -L \
142+
-X DELETE \
143+
-H "Accept: application/vnd.github+json" \
144+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
145+
-H "X-GitHub-Api-Version: 2022-11-28" \
146+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-domain-class || true
147+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-i18n"
148+
run: |
149+
curl -L \
150+
-X DELETE \
151+
-H "Accept: application/vnd.github+json" \
152+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
153+
-H "X-GitHub-Api-Version: 2022-11-28" \
154+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-i18n || true
155+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-interceptors"
156+
run: |
157+
curl -L \
158+
-X DELETE \
159+
-H "Accept: application/vnd.github+json" \
160+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
161+
-H "X-GitHub-Api-Version: 2022-11-28" \
162+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-interceptors || true
163+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-mimetypes"
164+
run: |
165+
curl -L \
166+
-X DELETE \
167+
-H "Accept: application/vnd.github+json" \
168+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
169+
-H "X-GitHub-Api-Version: 2022-11-28" \
170+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-mimetypes || true
171+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-validation"
172+
run: |
173+
curl -L \
174+
-X DELETE \
175+
-H "Accept: application/vnd.github+json" \
176+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
177+
-H "X-GitHub-Api-Version: 2022-11-28" \
178+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-validation || true
179+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-rest"
180+
run: |
181+
curl -L \
182+
-X DELETE \
183+
-H "Accept: application/vnd.github+json" \
184+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
185+
-H "X-GitHub-Api-Version: 2022-11-28" \
186+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-rest || true
187+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-url-mappings"
188+
run: |
189+
curl -L \
190+
-X DELETE \
191+
-H "Accept: application/vnd.github+json" \
192+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
193+
-H "X-GitHub-Api-Version: 2022-11-28" \
194+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-url-mappings || true
195+
- name: "💥 Purge Existing Builds - org.grails.grails-plugin-services"
196+
run: |
197+
curl -L \
198+
-X DELETE \
199+
-H "Accept: application/vnd.github+json" \
200+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
201+
-H "X-GitHub-Api-Version: 2022-11-28" \
202+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-plugin-services || true
203+
- name: "💥 Purge Existing Builds - org.grails.grails-shell"
204+
run: |
205+
curl -L \
206+
-X DELETE \
207+
-H "Accept: application/vnd.github+json" \
208+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
209+
-H "X-GitHub-Api-Version: 2022-11-28" \
210+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-shell || true
211+
- name: "💥 Purge Existing Builds - org.grails.grails-web"
212+
run: |
213+
curl -L \
214+
-X DELETE \
215+
-H "Accept: application/vnd.github+json" \
216+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
217+
-H "X-GitHub-Api-Version: 2022-11-28" \
218+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web || true
219+
- name: "💥 Purge Existing Builds - org.grails.grails-spring"
220+
run: |
221+
curl -L \
222+
-X DELETE \
223+
-H "Accept: application/vnd.github+json" \
224+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
225+
-H "X-GitHub-Api-Version: 2022-11-28" \
226+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-spring || true
227+
- name: "💥 Purge Existing Builds - org.grails.grails-test"
228+
run: |
229+
curl -L \
230+
-X DELETE \
231+
-H "Accept: application/vnd.github+json" \
232+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
233+
-H "X-GitHub-Api-Version: 2022-11-28" \
234+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-test || true
235+
- name: "💥 Purge Existing Builds - org.grails.grails-web-boot"
236+
run: |
237+
curl -L \
238+
-X DELETE \
239+
-H "Accept: application/vnd.github+json" \
240+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
241+
-H "X-GitHub-Api-Version: 2022-11-28" \
242+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web-boot || true
243+
- name: "💥 Purge Existing Builds - org.grails.grails-web-common"
244+
run: |
245+
curl -L \
246+
-X DELETE \
247+
-H "Accept: application/vnd.github+json" \
248+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
249+
-H "X-GitHub-Api-Version: 2022-11-28" \
250+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web-common || true
251+
- name: "💥 Purge Existing Builds - org.grails.grails-web-url-mappings"
252+
run: |
253+
curl -L \
254+
-X DELETE \
255+
-H "Accept: application/vnd.github+json" \
256+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
257+
-H "X-GitHub-Api-Version: 2022-11-28" \
258+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web-url-mappings || true
259+
- name: "💥 Purge Existing Builds - org.grails.grails-web-databinding"
260+
run: |
261+
curl -L \
262+
-X DELETE \
263+
-H "Accept: application/vnd.github+json" \
264+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
265+
-H "X-GitHub-Api-Version: 2022-11-28" \
266+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web-databinding || true
267+
- name: "💥 Purge Existing Builds - org.grails.grails-web-mvc"
268+
run: |
269+
curl -L \
270+
-X DELETE \
271+
-H "Accept: application/vnd.github+json" \
272+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
273+
-H "X-GitHub-Api-Version: 2022-11-28" \
274+
https://api.github.com/orgs/${{ github.repository_owner }}/packages/maven/org.grails.grails-web-mvc || true
19275
- name: "📥 Checkout repository"
20276
uses: actions/checkout@v4
277+
- name: "⎌ Revert Prevent Snapshot Publishing Flag"
278+
run: |
279+
sed -i "s/^preventSnapshotPublish.*$/preventSnapshotPublish\=false/" gradle.properties
280+
- name: "📩 Commit flag to allow snapshot publishing"
281+
run: |
282+
git config user.name "${{ env.GIT_USER_NAME }}"
283+
git config user.email "${{ env.GIT_USER_EMAIL }}"
284+
git add gradle.properties
285+
if ! git diff --cached --quiet; then
286+
git commit -m "[skip ci] Restore Snapshot Publishing"
287+
git push origin HEAD
288+
else
289+
echo "Publishing already enabled."
290+
fi
21291
- name: "☕️ Setup JDK"
22292
uses: actions/setup-java@v4
23293
with:

‎INSTALL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
For installation instructions see the manual in the docs subdirectory or online at <https://grails.org/Installation>.
1+
For installation instructions see <https://docs.grails.org/latest/guide/single.html#build>.

‎UPGRADE7.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ Experienced while upgrading modules for Grails 7
3333
- Completely up to date modern stack that has been optimized for easier future transitions.
3434
- GSP can now be used OUTSIDE of Grails! see grails-boot
3535
- Works with Spring Security 6 out of the box. No plugin needed!
36-
- Tested and works with Java [17-23](https://github.com/grails/grails-core/blob/0549617f27aeb5b90b64797fa4147dde40fc9c86/.github/workflows/gradle.yml#L18)
36+
- Tested and works with Java 17-23 [grails-core](https://github.com/grails/grails-core/blob/7.0.x/.github/workflows/gradle.yml#L18) and [grails-functional-tests](https://github.com/grails/grails-functional-tests/blob/7.0.x/.github/workflows/gradle.yml#L21)

0 commit comments

Comments
 (0)