Merge pull request #12236 from grails/releasenotes

Update Release Note Workflow Config, Release Drafter template
grails · Dec 8, 2021 · 0a7142c · 0a7142c
2 parents a6497bd + 63e2b06
commit 0a7142c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,23 +1,12 @@
 name-template: $RESOLVED_VERSION
 tag-template: v$RESOLVED_VERSION
-version-resolver:
-  major:
-    labels:
-      - 'type: major'
-  minor:
-    labels:
-      - 'type: minor'
-  patch:
-    labels:
-      - 'type: patch'
-  default: patch
 categories:
-  - title: 🚀 Features
+  - title: ✨ Features
     labels:
       - "type: enhancement"
       - "type: new feature"
       - "type: major"
-  - title: 🚀 Bug Fixes/Improvements
+  - title: 🐛 Bug Fixes/Improvements
     labels:
       - "type: improvement"
       - "type: bug"
@@ -26,9 +15,24 @@ categories:
     labels:
       - "type: dependency upgrade"
       - "dependencies"
+  - title: ⚙️ Build/CI
+    labels:
+      - "type: ci"
+      - "type: build"
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+version-resolver:
+  major:
+    labels:
+      - 'type: major'
+  minor:
+    labels:
+      - 'type: minor'
+  patch:
+    labels:
+      - 'type: patch'
+  default: patch
 template: |
-  ## Changes
+  ## What's Changed
 
   $CHANGES
 

diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -18,14 +18,17 @@ jobs:
         run: |
           has_release_drafter=$([ -f .github/release-drafter.yml ] && echo "true" || echo "false")
           echo ::set-output name=has_release_drafter::${has_release_drafter}
-
+      - name: Extract branch name
+        id: extract_branch
+        run: echo ::set-output name=value::${GITHUB_REF:11}
       # If it has release drafter:
       - uses: release-drafter/release-drafter@v5.15.0
         if: steps.check_release_drafter.outputs.has_release_drafter == 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
-          commitish: master
+          commitish: ${{ steps.extract_branch.outputs.value }}
+          filter-by-commitish: true
       # Otherwise:
       - name: Export Gradle Properties
         if: steps.check_release_drafter.outputs.has_release_drafter == 'false'