From 73cd26aea3d083e483720ad9ac51d1467227e7c3 Mon Sep 17 00:00:00 2001
From: Jeremy Wood <jeremy.wood@7factor.io>
Date: Mon, 20 Feb 2023 07:17:37 -0500
Subject: [PATCH] Combine release and publish into a single workflow.

---
 .github/workflows/publish.yml | 45 -----------------------------------
 .github/workflows/release.yml | 21 ++++++++++++++--
 2 files changed, 19 insertions(+), 47 deletions(-)
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 3eeff543..00000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Publish package to GitHub Packages
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Get release
-        id: get_release
-        uses: bruceadams/get-release@v1.3.2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Publish package
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: publish
-        env:
-          GITHUB_VERSION: ${{ steps.get_release.outputs.tag_name }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload release artifact
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.RELEASE_TOKEN }}
-          file: build/libs/multiverse-core-${{ steps.get_release.outputs.tag_name }}.jar
-          asset_name: multiverse-core-${{ steps.get_release.outputs.tag_name }}.jar
-          tag: ${{ steps.get_release.outputs.tag_name }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8770de6d..738878dc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Create Release Version
+name: Create Release Version & Publish Package
 
 on:
   push:
@@ -27,11 +27,28 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create release
+        id: release
         uses: rymndhng/release-on-push-action@v0.27.0
         env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           bump_version_scheme: norelease
           tag_prefix: ''
           release_name: "Release <RELEASE_VERSION>"
           use_github_release_notes: true
+
+      - name: Publish package
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publish
+        env:
+          GITHUB_VERSION: ${{ steps.release.outputs.tag_name }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload release artifact
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: build/libs/multiverse-core-${{ steps.release.outputs.tag_name }}.jar
+          asset_name: multiverse-core-${{ steps.release.outputs.tag_name }}.jar
+          tag: ${{ steps.release.outputs.tag_name }}