Skip to content

Commit c2ac465

Browse files
authored
Fix CI workflows (#60)
* ci: Update Git user to dedicated CI account Replace a personal GitHub account with the dedicated CI account for Git operations in GitHub Actions. This ensures commits and tags created during CI runs are properly attributed to the CI system. * ci: Switch secret for `DEVELOCITY_ACCESS_KEY` The secret in this repo is named `DEVELOCITY_ACCESS_KEY`. * ci: Fix release-notes.yml Error: Data doesn't contain `nodes` field.
1 parent 8b34b22 commit c2ac465

File tree

3 files changed

+21
-49
lines changed

3 files changed

+21
-49
lines changed

.github/workflows/gradle.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
branches:
88
- '[4-9]+.[0-9]+.x'
99
env:
10-
GIT_USER_NAME: puneetbehl
11-
GIT_USER_EMAIL: [email protected]
10+
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
11+
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
1212

1313
jobs:
1414

@@ -31,7 +31,7 @@ jobs:
3131
- uses: gradle/actions/setup-gradle@v3
3232
- name: Run tests
3333
env:
34-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
34+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3535
run: ./gradlew check
3636

3737
publish_snapshot:
@@ -48,13 +48,13 @@ jobs:
4848

4949
- name: Build Project
5050
env:
51-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
51+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5252
run: ./gradlew build
5353

5454
- name: Publish Snapshot version to Artifactory (repo.grails.org)
5555
if: success()
5656
env:
57-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
57+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5858
ORG_GRADLE_PROJECT_artifactoryPublishUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
5959
ORG_GRADLE_PROJECT_artifactoryPublishPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
6060
run: >
@@ -65,7 +65,7 @@ jobs:
6565
- name: Generate Snapshot Documentation
6666
if: success()
6767
env:
68-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
68+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6969
run: ./gradlew docs
7070

7171
- name: Publish Snapshot Documentation to Github Pages
Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,23 @@
1-
name: Changelog
1+
name: "Release Drafter"
22
on:
33
issues:
4-
types: [closed,reopened]
4+
types: [closed, reopened]
55
push:
66
branches:
7+
- master
78
- '[4-9]+.[0-9]+.x'
89
pull_request:
9-
types: [opened, reopened, synchronize, labeled]
10+
types: [opened, reopened, synchronize]
1011
pull_request_target:
11-
types: [opened, reopened, synchronize, labeled]
12+
types: [opened, reopened, synchronize]
1213
workflow_dispatch:
1314
jobs:
14-
release_notes:
15+
update_release_draft:
16+
permissions:
17+
contents: read # limit to read access
1518
runs-on: ubuntu-latest
1619
steps:
17-
- uses: actions/checkout@v3
18-
- name: Check if it has release drafter config file
19-
id: check_release_drafter
20-
run: |
21-
has_release_drafter=$([ -f .github/release-drafter.yml ] && echo "true" || echo "false")
22-
echo "has_release_drafter=${has_release_drafter}" >> $GITHUB_OUTPUT
23-
- name: Extract branch name
24-
id: extract_branch
25-
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
26-
# If it has release drafter:
27-
- uses: release-drafter/release-drafter@v5
28-
if: steps.check_release_drafter.outputs.has_release_drafter == 'true'
20+
- name: "📝 Update Release Draft"
21+
uses: release-drafter/release-drafter@v6
2922
env:
30-
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
31-
with:
32-
commitish: ${{ steps.extract_branch.outputs.value }}
33-
# Otherwise:
34-
- name: Export Gradle Properties
35-
if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
36-
uses: micronaut-projects/github-actions/export-gradle-properties@master
37-
- uses: micronaut-projects/github-actions/release-notes@master
38-
if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
39-
id: release_notes
40-
with:
41-
token: ${{ secrets.GH_TOKEN }}
42-
- uses: ncipollo/release-action@v1
43-
if: steps.check_release_drafter.outputs.has_release_drafter == 'false' && steps.release_notes.outputs.generated_changelog == 'true'
44-
with:
45-
allowUpdates: true
46-
commit: ${{ steps.release_notes.outputs.current_branch }}
47-
draft: true
48-
name: "${{ env.title }} ${{ steps.release_notes.outputs.next_version }}"
49-
tag: v${{ steps.release_notes.outputs.next_version }}
50-
bodyFile: CHANGELOG.md
51-
token: ${{ secrets.GH_TOKEN }}
23+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ on:
33
release:
44
types: [published]
55
env:
6-
GIT_USER_NAME: puneetbehl
7-
GIT_USER_EMAIL: [email protected]
6+
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
7+
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
88

99
jobs:
1010
release:
@@ -32,7 +32,7 @@ jobs:
3232
- name: Publish artifacts to Sonatype
3333
id: publish_to_sonatype
3434
env:
35-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
35+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3636
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
3737
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
3838
ORG_GRADLE_PROJECT_sonatypeStagingProfileId: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
@@ -47,7 +47,7 @@ jobs:
4747
- name: Generate Documentation
4848
if: success()
4949
env:
50-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
50+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5151
run: ./gradlew docs
5252

5353
- name: Publish Documentation to Github Pages

0 commit comments

Comments
 (0)