Merge pull request #2964 from Multiverse/actions-better

Multiverse · Aug 23, 2023 · f67d8ef · f67d8ef
2 parents fdb9125 + 70132c0
commit f67d8ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/.github/workflows/call.github_release.yml b/.github/workflows/call.github_release.yml
@@ -30,12 +30,6 @@ jobs:
       release_created: ${{ steps.release.outputs.release_created }}
       tag_name: ${{ steps.release.outputs.tag_name }}
     steps:
-      - name: Echo inputs
-        run: |
-          echo "release_mode: ${{ inputs.release_mode }}"
-          echo "version_bump: ${{ inputs.version_bump }}"
-          echo "promote_from: ${{ inputs.promote_from }}"
-
       - uses: actions/checkout@v3
         with:
           ref: ${{ inputs.promote_from }}

diff --git a/.github/workflows/call.platform_uploads.yml b/.github/workflows/call.platform_uploads.yml
@@ -42,23 +42,18 @@ jobs:
         file: multiverse-core-${{ steps.release-info.outputs.tag_name }}.jar
 
     - name: Parse release type
+      id: parse-release-type
       run: |
         if [[ "${{ steps.release-info.outputs.prerelease }}" == "true" ]]; then
-            echo Setting RELEASE_TYPE to Beta
-            echo "RELEASE_TYPE=Beta" >> $GITHUB_ENV
+            echo Setting release_type to Beta
+            echo "release_type=Beta" >> $GITHUB_OUTPUT
         else
-          echo Setting RELEASE_TYPE to Release
-            echo "RELEASE_TYPE=Release" >> $GITHUB_ENV
+          echo Setting release_type to Release
+            echo "release_type=Release" >> $GITHUB_OUTPUT
         fi
 
-    - name: echo inputs
-      run: |
-        echo "upload_modrinth: ${{ inputs.upload_modrinth }}"
-        echo "upload_dbo: ${{ inputs.upload_dbo }}"
-        echo "RELEASE_TYPE: ${{ env.RELEASE_TYPE }}"
-
     - name: Upload to Modrinth
-      if: inputs.upload_modrinth == 'true'
+      if: ${{ !cancelled() || inputs.upload_modrinth == 'true' }}
       uses: benwoo1110/modrinth-upload-action@v1
       with:
         api_token: ${{ secrets.MODRINTH_TOKEN }}
@@ -68,11 +63,11 @@ jobs:
         name: ${{ steps.release-info.outputs.tag_name }}
         changelog: ${{ steps.release-artifact.outputs.body }}
         game_versions: 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13
-        version_type: ${{ env.RELEASE_TYPE }}
+        version_type: ${{ steps.parse-release-type.outputs.release_type }}
         loaders: bukkit, spigot, paper
 
     - name: Upload to DBO
-      if: inputs.upload_dbo == 'true'
+      if: ${{ !cancelled() || inputs.upload_dbo == 'true' }}
       uses: benwoo1110/dbo-upload-action@v1
       with:
         api_token: ${{ secrets.DBO_UPLOAD_API_TOKEN }}
@@ -81,7 +76,7 @@ jobs:
         changelog_type: markdown
         display_name: ${{ steps.release-info.outputs.tag_name }}
         game_versions: 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17, 1.16, 1.15, 1.14, 1.13
-        release_type: ${{ env.RELEASE_TYPE }}
+        release_type: ${{ steps.parse-release-type.outputs.release_type }}
         project_relations: >
           [
             {"slug": "multiverse-portals", "type": "optionalDependency"},