Update release configuration

moditect · Aug 8, 2022 · f4ed2d8 · f4ed2d8
1 parent 9dc0297
commit f4ed2d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DISTRO }}

diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DISTRO }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,6 +19,8 @@ name: Release
 env:
   JAVA_VERSION: '17'
   JAVA_DISTRO: 'zulu'
+  USER_EMAIL: '41898282+github-actions[bot]@users.noreply.github.com'
+  USER_NAME: 'GitHub Action'
 
 on:
   workflow_dispatch:
@@ -38,7 +40,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-java@v3
+      - name: Setup Java
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DISTRO }}
@@ -68,8 +71,8 @@ jobs:
           fi
           echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV
           ./mvnw -B -ntp versions:set versions:commit -DnewVersion=$RELEASE_VERSION
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "GitHub Action"
+          git config --global user.email "${{ env.USER_EMAIL }}"
+          git config --global user.name "${{ env.USER_NAME }}"
           git commit -a -m "🏁 Releasing version $RELEASE_VERSION"
           git push origin HEAD:master
 
@@ -84,7 +87,6 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         run: |
           export GPG_TTY=$(tty)
-          export MAVEN_OPTS=--illegal-access=permit
           ./mvnw --no-transfer-progress -B --file pom.xml \
             -Drepository.url=https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git \
             -Dmaven.site.skip=true -Drelease=true -DskipTests=true deploy
@@ -109,7 +111,7 @@ jobs:
       - name: 'Set next version'
         run: |
           ./mvnw -B versions:set versions:commit -DnewVersion=${{ env.NEXT_VERSION }}
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "GitHub Action"
+          git config --global user.email "${{ env.USER_EMAIL }}"
+          git config --global user.name "${{ env.USER_NAME }}"
           git commit -a -m "⬆️  Next version ${{ env.NEXT_VERSION }}"
           git push origin HEAD:master