From cfac515d1dd0c1cf29929037f938330ee933b62d Mon Sep 17 00:00:00 2001
From: micronaut-build <micronaut-build-account@grails.org>
Date: Thu, 25 Jun 2020 09:39:11 +0000
Subject: [PATCH] Update common files

---
 .github/workflows/dependency-update.yml |  4 ++--
 .github/workflows/release-notes.yml     | 11 ++++++-----
 .github/workflows/release.yml           |  6 ++++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dependency-update.yml b/.github/workflows/dependency-update.yml
index a71906a5..aed23534 100644
--- a/.github/workflows/dependency-update.yml
+++ b/.github/workflows/dependency-update.yml
@@ -30,8 +30,8 @@ jobs:
         uses: peter-evans/create-pull-request@v2
         with:
           token: ${{ secrets.GH_TOKEN }}
-          committer: GitHub <noreply@github.com>
-          author: micronaut-build <micronaut-build@users.noreply.github.com>
+          committer: micronaut-build <${{ secrets.MICRONAUT_BUILD_EMAIL }}>
+          author: micronaut-build <${{ secrets.MICRONAUT_BUILD_EMAIL }}>
           commit-message: Update dependencies
           title: 'Dependency upgrades'
           body: Upgrades dependencies to their latest versions
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index 89933a8f..a6d6eec3 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -3,15 +3,15 @@
 # https://github.com/micronaut-projects/micronaut-project-template/tree/master/.github/workflows
 #
 # and edit them there. Note that it will be sync'ed to all the Micronaut repos
-name: Release Notes
+name: Changelog
 on:
   pull_request:
-    types: [closed, labeled]
+    types: closed
     branches:
       - master
       - '[1-9]+.[0-9]+.x'
   issues:
-    types: [closed,reopened, labeled]
+    types: [closed,reopened]
   push:
     branches:
       - master
@@ -33,7 +33,7 @@ jobs:
       - uses: release-drafter/release-drafter@v5
         if: steps.check_release_drafter.outputs.has_release_drafter == 'true'
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
 
       # Otherwise:
       - name: Export Gradle Properties
@@ -43,6 +43,7 @@ jobs:
         if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
         id: release_notes
         with:
+          token: ${{ secrets.GH_TOKEN }}
           branch: ${{ env.githubBranch }}
       - uses: ncipollo/release-action@v1
         if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
@@ -53,4 +54,4 @@ jobs:
           name: ${{ env.title }} ${{ steps.release_notes.outputs.next_version }}
           tag: v${{ steps.release_notes.outputs.next_version }}
           bodyFile: CHANGELOG.md
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b4c9fbc5..1b4bff60 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,6 +23,8 @@ jobs:
         run: echo ::set-output name=release_version::${GITHUB_REF:11}
       - name: Run pre-release
         uses: micronaut-projects/github-actions/pre-release@master
+        env:
+          MICRONAUT_BUILD_EMAIL: ${{ secrets.MICRONAUT_BUILD_EMAIL }}
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to Bintray
@@ -52,11 +54,15 @@ jobs:
         continue-on-error: true
       - name: Update BOM
         uses: micronaut-projects/github-actions/update-bom@master
+        env:
+          MICRONAUT_BUILD_EMAIL: ${{ secrets.MICRONAUT_BUILD_EMAIL }}
         with:
           token: ${{ secrets.GH_TOKEN }}
         continue-on-error: true
       - name: Run post-release
         if: success()
         uses: micronaut-projects/github-actions/post-release@master
+        env:
+          MICRONAUT_BUILD_EMAIL: ${{ secrets.MICRONAUT_BUILD_EMAIL }}
         with:
           token: ${{ secrets.GITHUB_TOKEN }}