Skip to content

Commit 8786567

Browse files
matreimatrei
authored
fix(build): Update Build and CI (#1005)
- Use version catalogs - Cleanup and update Github workflows - Cleanup test apps - Cleanup unused dependencies - Update dependencies - Set correct/minimal dependency configuration scopes - Remove unused imports - Move docs dropdown version list to gradle.properties
1 parent 47b2991 commit 8786567

File tree

88 files changed

+996
-12176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+996
-12176
lines changed

‎.github/release-drafter.yml

Lines changed: 90 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,109 @@
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|deps)\/.+/'
27+
title:
28+
- '/(chore|refactor|style|test|ci|perf|build|deps)/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'
1184
- "type: improvement"
1285
- "type: bug"
1386
- "type: minor"
14-
- title: 🛠 Dependency upgrades
87+
- title: '📚 Documentation'
1588
labels:
89+
- 'docs'
90+
- title: '🔧 Maintenance'
91+
labels:
92+
- 'chore'
93+
- 'refactor'
94+
- 'style'
95+
- 'test'
96+
- 'ci'
97+
- 'perf'
98+
- 'build'
99+
- 'deps'
16100
- "type: dependency upgrade"
17101
- "dependencies"
18-
- title: ⚙️ Build/CI
19-
labels:
20102
- "type: ci"
21103
- "type: build"
104+
- title: '⏪ Reverts'
105+
labels:
106+
- 'revert'
22107
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
23108
version-resolver:
24109
major:
@@ -31,7 +116,6 @@ version-resolver:
31116
labels:
32117
- 'type: patch'
33118
default: patch
34-
filter-by-commitish: false
35119
template: |
36120
## What's Changed
37121

‎.github/workflows/gradle.yml

Lines changed: 41 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -9,135 +9,92 @@ on:
99
- '[4-9]+.[0-9]+.x'
1010
- '[3-9]+.[3-9]+.x'
1111
workflow_dispatch:
12+
env:
13+
GIT_USER_NAME: puneetbehl
14+
GIT_USER_EMAIL: [email protected]
15+
1216
jobs:
1317
core-tests:
1418
if: github.event_name == 'pull_request'
1519
runs-on: ubuntu-latest
16-
env:
17-
WORKSPACE: ${{ github.workspace }}
18-
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
1920
steps:
2021
- uses: actions/checkout@v4
21-
- name: Set up JDK
22-
uses: actions/setup-java@v4
23-
with:
24-
distribution: 'adopt'
25-
java-version: '11.0.6'
22+
- uses: gradle/wrapper-validation-action@v2
23+
- uses: actions/setup-java@v4
24+
with: { java-version: 11, distribution: temurin }
2625
- name: Run Tests
27-
if: github.event_name == 'pull_request'
28-
id: tests
29-
uses: gradle/gradle-build-action@v2
26+
uses: gradle/actions/setup-gradle@v3
27+
env:
28+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3029
with:
3130
arguments: |
3231
check
3332
-Dgeb.env=chromeHeadless
34-
env:
35-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
36-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
37-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
38-
- name: Publish Test Report
39-
if: steps.tests.outcome == 'failure'
40-
uses: scacap/action-surefire-report@v1
41-
with:
42-
github_token: ${{ secrets.GITHUB_TOKEN }}
43-
report_paths: '**/build/test-results/test/TEST-*.xml'
33+
4434
functional-test:
4535
if: github.event_name == 'pull_request'
4636
runs-on: ubuntu-latest
4737
strategy:
4838
matrix:
4939
test-config: [ 'static', 'annotation', 'requestmap', 'basic', 'misc', 'putWithParams', 'bcrypt', 'issue503' ]
50-
env:
51-
WORKSPACE: ${{ github.workspace }}
52-
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
5340
steps:
5441
- uses: actions/checkout@v4
55-
- name: Set up JDK
56-
uses: actions/setup-java@v4
57-
with:
58-
distribution: 'adopt'
59-
java-version: '11.0.6'
42+
- uses: actions/setup-java@v4
43+
with: { java-version: 11, distribution: temurin }
6044
- name: Run Tests
61-
id: tests
62-
uses: gradle/gradle-build-action@v2
45+
uses: gradle/actions/setup-gradle@v3
46+
env:
47+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
6348
with:
6449
arguments: |
6550
examples-functional-test-app:check
6651
-Dgeb.env=chromeHeadless
6752
-DTESTCONFIG=${{ matrix.test-config }}
68-
env:
69-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
70-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
71-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
72-
- name: Publish Test Report
73-
if: steps.tests.outcome == 'failure'
74-
uses: scacap/action-surefire-report@v1
75-
with:
76-
github_token: ${{ secrets.GITHUB_TOKEN }}
77-
report_paths: '**/examples/functional-test-app/build/test-results/test/TEST-*.xml'
53+
7854
build:
7955
if: github.event_name == 'push'
8056
runs-on: ubuntu-latest
81-
env:
82-
WORKSPACE: ${{ github.workspace }}
83-
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
8457
steps:
8558
- uses: actions/checkout@v4
86-
- name: Set up JDK
87-
uses: actions/setup-java@v4
88-
with:
89-
distribution: 'adopt'
90-
java-version: '11.0.6'
59+
- uses: gradle/wrapper-validation-action@v2
60+
- uses: actions/setup-java@v4
61+
with: { java-version: 11, distribution: temurin }
9162
- name: Run Build
92-
if: github.event_name == 'push'
9363
id: build
94-
uses: gradle/gradle-build-action@v2
64+
uses: gradle/actions/setup-gradle@v3
9565
env:
9666
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
97-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
98-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
9967
with:
10068
arguments: |
101-
:spring-security-core:build
69+
spring-security-core:build
10270
-Dgeb.env=chromeHeadless
103-
- name: Publish Test Report
104-
if: steps.build.outcome == 'failure'
105-
uses: scacap/action-surefire-report@v1
106-
with:
107-
github_token: ${{ secrets.GITHUB_TOKEN }}
108-
report_paths: '**/build/test-results/test/TEST-*.xml'
109-
- name: Publish to repo.grails.org
110-
id: publish
111-
uses: gradle/gradle-build-action@v2
112-
if: steps.build.outcome == 'success' && github.event_name == 'push'
71+
72+
- name: Publish Snapshot artifacts to Artifactory (repo.grails.org)
73+
uses: gradle/actions/setup-gradle@v3
74+
if: success()
11375
env:
76+
ORG_GRADLE_PROJECT_artifactoryUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
77+
ORG_GRADLE_PROJECT_artifactoryPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
11478
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
115-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
116-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
117-
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
118-
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
11979
with:
12080
arguments: |
12181
-Dorg.gradle.internal.publish.checksums.insecure=true
122-
:spring-security-core:publish
123-
- name: Build Docs
124-
id: docs
125-
if: steps.build.outcome == 'success' && github.event_name == 'push'
126-
uses: gradle/gradle-build-action@v2
127-
with:
128-
arguments: :spring-security-core:docs
82+
spring-security-core:publish
83+
84+
- name: Generate Snapshot Documentation
85+
if: success()
86+
uses: gradle/actions/setup-gradle@v3
12987
env:
13088
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
131-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
132-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
133-
- name: Publish to Github Pages
134-
if: steps.docs.outcome == 'success' && github.event_name == 'push'
89+
with:
90+
arguments: spring-security-core:docs
91+
92+
- name: Publish Snapshot Documentation to Github Pages
93+
if: success()
13594
uses: micronaut-projects/github-pages-deploy-action@grails
13695
env:
137-
TARGET_REPOSITORY: ${{ github.repository }}
138-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
13996
BRANCH: gh-pages
97+
COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
98+
COMMIT_NAME: ${{ env.GIT_USER_NAME }}
14099
FOLDER: plugin/build/docs
141-
DOC_FOLDER: gh-pages
142-
COMMIT_EMAIL: [email protected]
143-
COMMIT_NAME: Puneet Behl
100+
GH_TOKEN: ${{ secrets.GH_TOKEN }}

‎.github/workflows/release-notes.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
push:
66
branches:
77
- '[4-9]+.[0-9]+.x'
8+
pull_request:
9+
types: [opened, reopened, synchronize]
10+
pull_request_target:
11+
types: [opened, reopened, synchronize]
812
workflow_dispatch:
913
jobs:
1014
release_notes:
@@ -20,7 +24,7 @@ jobs:
2024
id: extract_branch
2125
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
2226
# If it has release drafter:
23-
- uses: release-drafter/release-drafter@v5.25.0
27+
- uses: release-drafter/release-drafter@v6
2428
if: steps.check_release_drafter.outputs.has_release_drafter == 'true'
2529
env:
2630
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

0 commit comments

Comments
 (0)