Skip to content

Commit a441f67

Browse files
committed
Merge branch '5.0.x' into matrei/github-workflows
# Conflicts: # .github/workflows/gradle.yml # .github/workflows/release.yml
2 parents 36f2f48 + e9ebd9f commit a441f67

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

.github/workflows/gradle.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
pull_request:
77
branches:
88
- '[4-9]+.[0-9]+.x'
9+
env:
10+
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
11+
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
12+
913
jobs:
1014
test_project:
1115
name: "Test Project"
@@ -65,7 +69,7 @@ jobs:
6569
uses: micronaut-projects/github-pages-deploy-action@grails
6670
env:
6771
BRANCH: gh-pages
68-
COMMIT_EMAIL: ${{ vars.GIT_USER_EMAIL }}
69-
COMMIT_NAME: ${{ vars.GIT_USER_NAME }}
72+
COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
73+
COMMIT_NAME: ${{ env.GIT_USER_NAME }}
7074
FOLDER: build/docs/manual
7175
GH_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/release-notes.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
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:
910
types: [opened, reopened, synchronize]

.github/workflows/release.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: "Release"
22
on:
33
release:
44
types: [published]
5+
env:
6+
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
7+
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
58
jobs:
69
release:
710
runs-on: ubuntu-latest
@@ -26,7 +29,6 @@ jobs:
2629
env:
2730
SECRING_FILE: ${{ secrets.SECRING_FILE }}
2831
run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
29-
3032
- name: "📤 Publish artifacts to Sonatype"
3133
id: publish_to_sonatype
3234
env:
@@ -48,8 +50,8 @@ jobs:
4850
uses: micronaut-projects/github-pages-deploy-action@grails
4951
env:
5052
BRANCH: gh-pages
51-
COMMIT_EMAIL: ${{ vars.GIT_USER_EMAIL }}
52-
COMMIT_NAME: ${{ vars.GIT_USER_NAME }}
53+
COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
54+
COMMIT_NAME: ${{ env.GIT_USER_NAME }}
5355
FOLDER: build/docs/manual
5456
GH_TOKEN: ${{ secrets.GH_TOKEN }}
5557
VERSION: ${{ steps.release_version.outputs.release_version }}

0 commit comments

Comments
 (0)