Merge pull request #2854 from Multiverse/dumptruckman/fix_release_8

Combine release and publish into a single workflow.
2023-02-20 07:20:05 -05:00 · 2023-02-20 07:17:37 -05:00 · 2023-02-20 06:42:31 -05:00 · 2023-02-20 14:57:52 +08:00 · 2023-02-20 14:57:01 +08:00 · 2023-02-20 00:58:06 -05:00
3 changed files with 21 additions and 51 deletions
@@ -1,47 +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: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: build/libs/multiverse-core-${{ steps.get_release.outputs.tag }}.jar
-          asset_name: multiverse-core-${{ steps.get_release.outputs.tag }}.jar
-          asset_content_type: application/java-archive
@@ -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: v
+          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 }}
@@ -7,7 +7,7 @@ plugins {
    id 'com.github.johnrengelman.shadow' version '7.1.2'
 }

-version = System.getenv('GITHUB_VERSION')?.substring(1) ?: 'local'
+version = System.getenv('GITHUB_VERSION') ?: 'local'
 group = 'com.onarandombox.multiversecore'
 description = 'Multiverse-Core'
Author	SHA1	Message	Date
Jeremy Wood	908fcb1e44	Merge pull request #2854 from Multiverse/dumptruckman/fix_release_8 Combine release and publish into a single workflow.	2023-02-20 07:20:05 -05:00
Jeremy Wood	73cd26aea3	Combine release and publish into a single workflow.	2023-02-20 07:17:37 -05:00
Jeremy Wood	758d25812b	Merge pull request #2853 from Multiverse/fix-gha-release Fix upload release artifact	2023-02-20 06:42:31 -05:00
Ben Woo	fa0ef421c7	Merge branch 'main' into fix-gha-release	2023-02-20 14:57:52 +08:00
Ben Woo	e936a6271f	Fix upload release artifact	2023-02-20 14:57:01 +08:00
Jeremy Wood	7362e543da	Merge pull request #2851 from Multiverse/dumptruckman/fix_release_7 Use new action for uploading artifact.	2023-02-20 00:58:06 -05:00
Jeremy Wood	8a46d70301	Use new action for uploading artifact.	2023-02-20 00:57:21 -05:00
Jeremy Wood	a168e5cb48	Merge pull request #2850 from Multiverse/dumptruckman/fix_release_6 Massage the strange release upload url.	2023-02-20 00:38:53 -05:00
Jeremy Wood	ae578f9491	Massage the strange release upload url.	2023-02-20 00:36:45 -05:00
Jeremy Wood	e72122378d	Merge pull request #2849 from Multiverse/dumptruckman/fix_release_5 Fix name of consumed output variable on get_release in more places.	2023-02-20 00:06:05 -05:00
Jeremy Wood	fd2ea3df09	Remove tag prefix.	2023-02-20 00:04:43 -05:00
Jeremy Wood	e94e071c6e	Fix name of consumed output variable on get_release in more places.	2023-02-19 23:58:26 -05:00