Skip to content

Commit 2ce7368

Browse files
matreimatrei
authored
Minor build updates (#523)
* build: Remove redundant config The class configured as springBoot mainClass was deleted in a previous commit so this configuration is no longer necessary. * build: Use setter syntax for signing.required Use setter syntax as that provides better IDE support. * ci: Improve Github workflows - Split project testing and building in CI to be able to run the former with a matrix of java versions. - Improve job and step names to reflect what is actually done in the steps. - Order env vars alphabetically. - Centralize user name and email handling. - Remove some redundant env vars that were set to the same as the default values.
1 parent 2096c7a commit 2ce7368

File tree

4 files changed

+44
-60
lines changed

4 files changed

+44
-60
lines changed

‎.github/workflows/gradle.yml

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,29 @@ name: Java CI
22
on:
33
push:
44
branches:
5-
- master
65
- '[2-9]+.[0-9]+.x'
76
pull_request:
87
branches:
9-
- master
108
- '[2-9]+.[0-9]+.x'
9+
env:
10+
GIT_USER_NAME: puneetbehl
11+
GIT_USER_EMAIL: behlp@unityfoundation.io
12+
1113
jobs:
1214

13-
build:
15+
test_project:
1416
runs-on: ubuntu-latest
15-
17+
if: github.event_name == 'pull_request'
1618
strategy:
17-
fail-fast: false
18-
matrix:
19-
java: [11, 17]
20-
21-
env:
22-
WORKSPACE: ${{ github.workspace }}
23-
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
24-
19+
fail-fast: false
20+
matrix: { java: [11, 17] }
2521
steps:
2622
- uses: actions/checkout@v4
2723
- uses: gradle/wrapper-validation-action@v2
2824
- uses: actions/setup-java@v4
2925
with:
3026
distribution: temurin
3127
java-version: ${{ matrix.java }}
32-
3328
- name: Run Tests
3429
if: github.event_name == 'pull_request'
3530
id: tests
@@ -39,56 +34,55 @@ jobs:
3934
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
4035
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
4136
with:
42-
arguments: |
43-
check
44-
-Dgeb.env=chromeHeadless
37+
arguments: check -Dgeb.env=chromeHeadless
4538

39+
build_project:
40+
runs-on: ubuntu-latest
41+
if: github.event_name == 'push'
42+
steps:
43+
- uses: actions/checkout@v4
44+
- uses: gradle/wrapper-validation-action@v2
45+
- uses: actions/setup-java@v4
46+
with: { java-version: 11, distribution: temurin }
4647
- name: Run Build
47-
if: github.event_name == 'push'
48-
id: build
4948
uses: gradle/actions/setup-gradle@v3
5049
env:
5150
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
5251
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
5352
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
5453
with:
55-
arguments: |
56-
build
57-
-Dgeb.env=chromeHeadless
54+
arguments: build -Dgeb.env=chromeHeadless
5855

59-
- name: Publish Snapshot to repo.grails.org
60-
id: publish
56+
- name: Publish Snapshot artifacts to Artifactory (repo.grails.org)
57+
if: success()
6158
uses: gradle/actions/setup-gradle@v3
62-
if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
6359
env:
64-
ORG_GRADLE_PROJECT_artifactoryUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
65-
ORG_GRADLE_PROJECT_artifactoryPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
6660
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
6761
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
68-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
62+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
63+
ORG_GRADLE_PROJECT_artifactoryPublishUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
64+
ORG_GRADLE_PROJECT_artifactoryPublishPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
6965
with:
7066
arguments: |
7167
-Dorg.gradle.internal.publish.checksums.insecure=true
7268
publish
7369
74-
- name: Build Docs
75-
id: docs
76-
if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
70+
- name: Generate Snapshot Documentation
71+
if: success()
7772
uses: gradle/actions/setup-gradle@v3
7873
env:
7974
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
8075
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
81-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
76+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
8277
with:
8378
arguments: views-docs:docs
8479

85-
- name: Publish Snapshot docs to Github Pages
86-
if: steps.docs.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
80+
- name: Publish Snapshot Documentation to Github Pages
81+
if: success()
8782
uses: micronaut-projects/github-pages-deploy-action@grails
8883
env:
89-
TARGET_REPOSITORY: ${{ github.repository }}
90-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
9184
BRANCH: gh-pages
85+
COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
86+
COMMIT_NAME: ${{ env.GIT_USER_NAME }}
9287
FOLDER: docs/build/docs
93-
COMMIT_EMAIL: behlp@unityfoundation.io
94-
COMMIT_NAME: Puneet Behl
88+
GH_TOKEN: ${{ secrets.GH_TOKEN }}

‎.github/workflows/release.yml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,32 @@ on:
44
types: [published]
55

66
jobs:
7-
87
release:
98
runs-on: ubuntu-latest
10-
119
env:
1210
GIT_USER_NAME: puneetbehl
1311
GIT_USER_EMAIL: behlp@unityfoundation.io
14-
1512
steps:
16-
1713
- uses: actions/checkout@v4
1814
- uses: gradle/wrapper-validation-action@v2
1915
- uses: actions/setup-java@v4
2016
with: { java-version: 11, distribution: temurin }
2117

22-
- name: Set the current release version
18+
- name: Get the current release version
2319
id: release_version
24-
run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
20+
run: |
21+
echo "Release version: ${GITHUB_REF:11}"
22+
echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
2523
26-
- name: Run pre-release
24+
- name: Set projectVersion to the release version
2725
uses: micronaut-projects/github-actions/pre-release@master
2826

29-
- name: Generate secring file
27+
- name: Generate key file for artifact signing
3028
env:
3129
SECRING_FILE: ${{ secrets.SECRING_FILE }}
3230
run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
3331

34-
- name: Publish to Sonatype
32+
- name: Publish release artifacts to Sonatype
3533
id: publish_to_sonatype
3634
uses: gradle/actions/setup-gradle@v3
3735
env:
@@ -60,21 +58,18 @@ jobs:
6058
with:
6159
arguments: views-docs:docs
6260

63-
- name: Export Gradle Properties
64-
uses: micronaut-projects/github-actions/export-gradle-properties@master
65-
66-
- name: Publish to Github Pages
61+
- name: Publish Documentation to Github Pages
6762
if: success()
6863
uses: micronaut-projects/github-pages-deploy-action@grails
6964
env:
7065
BETA: ${{ contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }}
71-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
7266
BRANCH: gh-pages
73-
FOLDER: docs/build/docs
74-
VERSION: ${{ steps.release_version.outputs.release_version }}
7567
COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
7668
COMMIT_NAME: ${{ env.GIT_USER_NAME }}
69+
FOLDER: docs/build/docs
70+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
71+
VERSION: ${{ steps.release_version.outputs.release_version }}
7772

78-
- name: Run post-release
73+
- name: Set projectVersion to the next snapshot version
7974
if: success()
8075
uses: micronaut-projects/github-actions/post-release@master

‎gradle-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ gradlePlugin {
5353

5454
afterEvaluate {
5555
signing {
56-
required { isReleaseVersion && gradle.taskGraph.hasTask('publish') }
56+
required = { isReleaseVersion && gradle.taskGraph.hasTask('publish') }
5757
Publication[] publications = new Publication[publishing.publications.size() - 1]
5858
publishing.publications.findAll { it.name != 'pluginMaven' }.toArray(publications)
5959
sign(publications)

‎json/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ java {
3131
withSourcesJar()
3232
}
3333

34-
springBoot {
35-
// Project has 2 classes with main methods, so we need to specify which one to select
36-
mainClass = 'grails.plugin.json.view.Application'
37-
}
38-
3934
tasks.named('bootJar') {
4035
enabled = false // Don't need a bootJar for plugin
4136
}

0 commit comments

Comments
 (0)