Skip to content

Commit

Permalink
Fix CI workflows (#60)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
matrei authored Dec 3, 2024
1 parent 8b34b22 commit c2ac465
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 49 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
branches:
- '[4-9]+.[0-9]+.x'
env:
GIT_USER_NAME: puneetbehl
GIT_USER_EMAIL: [email protected]
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}

jobs:

Expand All @@ -31,7 +31,7 @@ jobs:
- uses: gradle/actions/setup-gradle@v3
- name: Run tests
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
run: ./gradlew check

publish_snapshot:
Expand All @@ -48,13 +48,13 @@ jobs:

- name: Build Project
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
run: ./gradlew build

- name: Publish Snapshot version to Artifactory (repo.grails.org)
if: success()
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
ORG_GRADLE_PROJECT_artifactoryPublishUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
ORG_GRADLE_PROJECT_artifactoryPublishPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
run: >
Expand All @@ -65,7 +65,7 @@ jobs:
- name: Generate Snapshot Documentation
if: success()
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
run: ./gradlew docs

- name: Publish Snapshot Documentation to Github Pages
Expand Down
50 changes: 11 additions & 39 deletions .github/workflows/release-notes.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,23 @@
name: Changelog
name: "Release Drafter"
on:
issues:
types: [closed,reopened]
types: [closed, reopened]
push:
branches:
- master
- '[4-9]+.[0-9]+.x'
pull_request:
types: [opened, reopened, synchronize, labeled]
types: [opened, reopened, synchronize]
pull_request_target:
types: [opened, reopened, synchronize, labeled]
types: [opened, reopened, synchronize]
workflow_dispatch:
jobs:
release_notes:
update_release_draft:
permissions:
contents: read # limit to read access
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Check if it has release drafter config file
id: check_release_drafter
run: |
has_release_drafter=$([ -f .github/release-drafter.yml ] && echo "true" || echo "false")
echo "has_release_drafter=${has_release_drafter}" >> $GITHUB_OUTPUT
- name: Extract branch name
id: extract_branch
run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
# If it has release drafter:
- uses: release-drafter/release-drafter@v5
if: steps.check_release_drafter.outputs.has_release_drafter == 'true'
- name: "📝 Update Release Draft"
uses: release-drafter/release-drafter@v6
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
with:
commitish: ${{ steps.extract_branch.outputs.value }}
# Otherwise:
- name: Export Gradle Properties
if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
uses: micronaut-projects/github-actions/export-gradle-properties@master
- uses: micronaut-projects/github-actions/release-notes@master
if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
id: release_notes
with:
token: ${{ secrets.GH_TOKEN }}
- uses: ncipollo/release-action@v1
if: steps.check_release_drafter.outputs.has_release_drafter == 'false' && steps.release_notes.outputs.generated_changelog == 'true'
with:
allowUpdates: true
commit: ${{ steps.release_notes.outputs.current_branch }}
draft: true
name: "${{ env.title }} ${{ steps.release_notes.outputs.next_version }}"
tag: v${{ steps.release_notes.outputs.next_version }}
bodyFile: CHANGELOG.md
token: ${{ secrets.GH_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ on:
release:
types: [published]
env:
GIT_USER_NAME: puneetbehl
GIT_USER_EMAIL: [email protected]
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}

jobs:
release:
Expand Down Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Publish artifacts to Sonatype
id: publish_to_sonatype
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
ORG_GRADLE_PROJECT_sonatypeStagingProfileId: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Generate Documentation
if: success()
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
run: ./gradlew docs

- name: Publish Documentation to Github Pages
Expand Down

0 comments on commit c2ac465

Please sign in to comment.