Merge branch '5.0.x' into matrei/github-workflows

# Conflicts: # .github/workflows/gradle.yml # .github/workflows/release.yml
gpc · Dec 3, 2024 · a441f67 · a441f67
2 parents 36f2f48 + e9ebd9f
commit a441f67
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches:
       - '[4-9]+.[0-9]+.x'
+env:
+  GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
+  GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
+
 jobs:
   test_project:
     name: "Test Project"
@@ -65,7 +69,7 @@ jobs:
         uses: micronaut-projects/github-pages-deploy-action@grails
         env:
           BRANCH: gh-pages
-          COMMIT_EMAIL: ${{ vars.GIT_USER_EMAIL }}
-          COMMIT_NAME: ${{ vars.GIT_USER_NAME }}
+          COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
+          COMMIT_NAME: ${{ env.GIT_USER_NAME }}
           FOLDER: build/docs/manual
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -1,9 +1,10 @@
 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]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,6 +2,9 @@ name: "Release"
 on:
   release:
     types: [published]
+env:
+  GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
+  GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -26,7 +29,6 @@ jobs:
         env:
           SECRING_FILE: ${{ secrets.SECRING_FILE }}
         run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
-
       - name: "📤 Publish artifacts to Sonatype"
         id: publish_to_sonatype
         env:
@@ -48,8 +50,8 @@ jobs:
         uses: micronaut-projects/github-pages-deploy-action@grails
         env:
           BRANCH: gh-pages
-          COMMIT_EMAIL: ${{ vars.GIT_USER_EMAIL }}
-          COMMIT_NAME: ${{ vars.GIT_USER_NAME }}
+          COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
+          COMMIT_NAME: ${{ env.GIT_USER_NAME }}
           FOLDER: build/docs/manual
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           VERSION: ${{ steps.release_version.outputs.release_version }}