Skip to content

Commit c943b70

Browse files
puneetbehlpuneetbehl
committed
Update GitHub Workflows
1 parent 050e080 commit c943b70

File tree

3 files changed

+58
-52
lines changed

3 files changed

+58
-52
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,87 +2,85 @@ name: Java CI
22
on:
33
push:
44
branches:
5-
- master
65
- '[4-9]+.[0-9]+.x'
76
- '[3-9]+.[3-9]+.x'
87
pull_request:
98
branches:
10-
- master
119
- '[4-9]+.[0-9]+.x'
1210
- '[3-9]+.[3-9]+.x'
1311
workflow_dispatch:
14-
15-
permissions:
16-
contents: read # to fetch code (actions/checkout)
17-
1812
jobs:
1913
build:
2014
permissions:
2115
contents: read # to fetch code (actions/checkout)
22-
checks: write # to publish result as PR check (scacap/action-surefire-report)
23-
2416
runs-on: ubuntu-latest
2517
strategy:
2618
matrix:
2719
java: ['11', '14']
2820
env:
2921
WORKSPACE: ${{ github.workspace }}
30-
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
3122
steps:
3223
- uses: actions/checkout@v4
3324
- name: Set up JDK
3425
uses: actions/setup-java@v3
3526
with:
3627
distribution: 'adopt'
3728
java-version: ${{ matrix.java }}
38-
- name: Run Tests
39-
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
40-
id: tests
41-
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2
42-
with:
43-
arguments: check groovydoc
44-
env:
45-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
46-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
4729
- name: Run Build
48-
if: github.event_name == 'push'
4930
id: build
50-
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2
31+
uses: gradle/gradle-build-action@v2
5132
env:
5233
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
5334
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
5435
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
5536
with:
5637
arguments: build groovydoc
57-
- name: Publish Test Report
58-
if: steps.build.outcome == 'failure' || steps.tests.outcome == 'failure'
59-
uses: scacap/action-surefire-report@v1
38+
publish:
39+
if: github.event_name == 'push'
40+
needs: ["build"]
41+
permissions:
42+
contents: read # to fetch code (actions/checkout)
43+
checks: write
44+
runs-on: ubuntu-latest
45+
steps:
46+
- name: Checkout repository
47+
uses: actions/checkout@v4
6048
with:
61-
github_token: ${{ secrets.GITHUB_TOKEN }}
62-
report_paths: '**/build/test-results/test/TEST-*.xml'
63-
- name: Publish to repo.grails.org
49+
token: ${{ secrets.GH_TOKEN }}
50+
- name: Set up JDK 11
51+
uses: actions/setup-java@v3
52+
with:
53+
distribution: 'adopt'
54+
java-version: 11
55+
- name: Publish Artifacts (repo.grails.org)
6456
id: publish
65-
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2
66-
if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
57+
uses: gradle/gradle-build-action@v2
6758
env:
59+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
60+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
61+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
6862
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
6963
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
7064
with:
7165
arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish
66+
invoke-third-party-workflows:
67+
if: github.event_name == 'push'
68+
needs: ["build", "publish"]
69+
permissions:
70+
contents: read # to fetch code (actions/checkout)
71+
runs-on: ubuntu-latest
72+
steps:
7273
- name: Extract branch name
73-
if: steps.publish.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
7474
id: extract_branch
75-
run: echo ::set-output name=value::${GITHUB_REF:11}
75+
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
7676
- name: Create Snapshot Message for the Workflow Dispatch
77-
if: steps.publish.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
7877
id: dispatch_message
79-
run: echo ::set-output name=value::{\"message\":\"New Core Snapshot $(date) - $GITHUB_SHA\"}
78+
run: echo "value::{\"message\":\"New Core Snapshot $(date) - $GITHUB_SHA\"}" >> $GITHUB_OUTPUT
8079
- name: Invoke the Java CI workflow in Grails Functional Tests
81-
if: steps.publish.outcome == 'success' && github.event_name == 'push' && matrix.java == '11'
82-
uses: benc-uk/workflow-dispatch@798e70c97009500150087d30d9f11c5444830385 # tag=v1.2
80+
uses: benc-uk/[email protected]
8381
with:
8482
workflow: Java CI
8583
repo: grails/grails-functional-tests
8684
ref: ${{ steps.extract_branch.outputs.value }}
8785
token: ${{ secrets.GH_TOKEN }}
88-
inputs: ${{ steps.dispatch_message.outputs.value }}
86+
inputs: ${{ steps.dispatch_message.outputs.value }}

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ jobs:
1515
java: ['11']
1616
env:
1717
GIT_USER_NAME: puneetbehl
18-
GIT_USER_EMAIL: [email protected]
19-
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
18+
GIT_USER_EMAIL: [email protected]
2019
steps:
2120
- name: Checkout repository
2221
uses: actions/checkout@v4
@@ -37,25 +36,32 @@ jobs:
3736
echo ::set-output name=value::${TARGET_BRANCH}
3837
- name: Set the current release version
3938
id: release_version
40-
run: echo ::set-output name=release_version::${GITHUB_REF:11}
39+
run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
4140
- name: Run pre-release
4241
uses: ./.github/actions/pre-release
4342
with:
4443
token: ${{ secrets.GITHUB_TOKEN }}
4544
- name: Run Assemble
4645
id: assemble
47-
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2
46+
uses: gradle/gradle-build-action@v2
4847
with:
4948
arguments: assemble
49+
env:
50+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
51+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
52+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
5053
- name: Generate secring file
5154
env:
5255
SECRING_FILE: ${{ secrets.SECRING_FILE }}
5356
run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
5457
- name: Publish to Sonatype OSSRH
5558
id: publish
5659
if: steps.assemble.outcome == 'success'
57-
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2
60+
uses: gradle/gradle-build-action@v2
5861
env:
62+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
63+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
64+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
5965
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
6066
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
6167
SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }}
@@ -86,13 +92,13 @@ jobs:
8692
if: steps.publish.outcome == 'success'
8793
id: grails_docs_release_message
8894
run: |
89-
echo ::set-output name=value::{\"grails_version\":\"$RELEASE_VERSION\"}
95+
echo "value={\"grails_version\":\"$RELEASE_VERSION\"}" >> $GITHUB_OUTPUT
9096
env:
9197
RELEASE_VERSION: ${{ steps.release_version.outputs.release_version }}
9298
- name: Invoke grails-doc release workflow
9399
if: steps.publish.outcome == 'success'
94100
id: grails_doc
95-
uses: benc-uk/workflow-dispatch@798e70c97009500150087d30d9f11c5444830385 # tag=v1.2
101+
uses: benc-uk/workflow-dispatch@1.2
96102
with:
97103
workflow: Release
98104
repo: grails/grails-doc
@@ -102,7 +108,7 @@ jobs:
102108
- name: Invoke grails-static-website release workflow
103109
if: steps.publish.outcome == 'success'
104110
id: grails_static_website
105-
uses: benc-uk/workflow-dispatch@798e70c97009500150087d30d9f11c5444830385 # tag=v1.2
111+
uses: benc-uk/workflow-dispatch@1.2
106112
with:
107113
workflow: Release
108114
repo: grails/grails-static-website

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
java: ['11']
2222
env:
2323
GIT_USER_NAME: puneetbehl
24-
GIT_USER_EMAIL: behlp@objectcomputing.com
24+
GIT_USER_EMAIL: behlp@unityfoundation.io
2525
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
2626
steps:
2727
- name: Checkout repository
@@ -39,21 +39,23 @@ jobs:
3939
id: extract_branch
4040
run: |
4141
echo $TARGET_BRANCH
42-
echo ::set-output name=value::${TARGET_BRANCH}
42+
echo "value=${TARGET_BRANCH}" >> $GITHUB_OUTPUT
4343
env:
4444
TARGET_BRANCH: ${{ github.event.inputs.target_branch }}
4545
- name: Set the current release version
4646
id: release_version
47-
run: echo ::set-output name=release_version::${VERSION}
47+
run: echo "release_version=${VERSION}" >> $GITHUB_OUTPUT
4848
env:
4949
VERSION: ${{ github.event.inputs.release }}
5050
- name: Run Assemble
5151
id: assemble
52-
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2
52+
uses: gradle/gradle-build-action@v2
5353
with:
5454
arguments: assemble
55-
- name: Export Gradle Properties
56-
uses: micronaut-projects/github-actions/export-gradle-properties@master
55+
env:
56+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
57+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
58+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
5759
- name: Upload artifacts to the Github release
5860
id: upload_artifact
5961
if: steps.assemble.outcome == 'success'
@@ -67,13 +69,13 @@ jobs:
6769
if: steps.assemble.outcome == 'success'
6870
id: grails_docs_release_message
6971
run: |
70-
echo ::set-output name=value::{\"grails_version\":\"$RELEASE_VERSION\"}
72+
echo "value::{\"grails_version\":\"$RELEASE_VERSION\"}" >> $GITHUB_OUTPUT
7173
env:
7274
RELEASE_VERSION: ${{ steps.release_version.outputs.release_version }}
7375
- name: Invoke grails-doc release workflow
7476
if: steps.assemble.outcome == 'success'
7577
id: grails_doc
76-
uses: benc-uk/workflow-dispatch@798e70c97009500150087d30d9f11c5444830385 # tag=v1.2
78+
uses: benc-uk/workflow-dispatch@1.2
7779
with:
7880
workflow: Release
7981
repo: grails/grails-doc
@@ -83,7 +85,7 @@ jobs:
8385
- name: Invoke grails-static-website release workflow
8486
if: steps.assemble.outcome == 'success'
8587
id: grails_static_website
86-
uses: benc-uk/workflow-dispatch@798e70c97009500150087d30d9f11c5444830385 # tag=v1.2
88+
uses: benc-uk/workflow-dispatch@1.2
8789
with:
8890
workflow: Release
8991
repo: grails/grails-static-website

0 commit comments

Comments
 (0)