rework release jobs

ToCraft · Aug 18, 2024 · 5273737 · 5273737
1 parent 6c5b038
commit 5273737
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 36 deletions.
diff --git a/.github/workflows/build_current.yml → .github/workflows/build_only.yml b/.github/workflows/build_current.yml → .github/workflows/build_only.yml
@@ -9,6 +9,8 @@ on:
       - '**/src/**'
     branches-ignore:
       - "1.**"
+      - "main"
+      - "master"
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Build and Release
+name: Release
 
 on:
   push:
@@ -10,16 +10,13 @@ on:
     branches:
       - "main"
       - "master"
+      - "1.**"
   workflow_dispatch:
     inputs:
       release:
         description: 'Release'
         required: false
         default: 'true'
-      discord_message:
-        description: 'Send Discord Message'
-        required: false
-        default: 'true'
 
 permissions:
   contents: write
@@ -42,18 +39,21 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
-      - name: Extract Artifact Type, Archive Base Name & Mod Version
+      - name: Extract Artifact Data
         run: |
           cat $GITHUB_WORKSPACE/gradle.properties | grep ^artifact_type= >> $GITHUB_ENV
           cat $GITHUB_WORKSPACE/gradle.properties | grep ^archives_base_name= >> $GITHUB_ENV
           cat $GITHUB_WORKSPACE/gradle.properties | grep ^mod_version= >> $GITHUB_ENV
+          cat $GITHUB_WORKSPACE/gradle.properties | grep ^archives_base_name= >> $GITHUB_ENV
+          cat $GITHUB_WORKSPACE/gradle.properties | grep ^mod_version= >> $GITHUB_ENV
 
-      - name: Build + Publish to Maven, Modrinth & CurseForge + Pack the ZIP for GH-Release
-        run: ./gradlew check build publish modrinth curseforge packTheMod
+      - name: Build + Release via Gradle
+        run: ./gradlew check build release
         env:
           MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+          DISCORD_WEB_HOOK: ${{ secrets.DISCORD_WEB_HOOK }}
       - uses: actions/upload-artifact@v4
         with:
           name: "${{ env.archives_base_name }}-${{ env.mod_version }}"
@@ -67,13 +67,6 @@ jobs:
             !**/*-transformProduction*.jar
             !**/testmod*/
 
-
-      - name: Extract Changelog for GitHub
-        run: ./gradlew extractNewestChangelog
-      - name: Create version data
-        run: |
-          cat $GITHUB_WORKSPACE/gradle.properties | grep ^archives_base_name= >> $GITHUB_ENV
-          cat $GITHUB_WORKSPACE/gradle.properties | grep ^mod_version= >> $GITHUB_ENV
       - name: Create GitHub Release
         if: |
           ${{ env.artifact_type }} == 'release'
@@ -83,23 +76,3 @@ jobs:
           files: |
             build/${{ env.archives_base_name }}-${{ env.mod_version }}.zip
           body_path: ${{ github.workspace }}/extracted.CHANGELOG.md
-  discord_message:
-    name: "Send Discord Release Message"
-    runs-on: ubuntu-latest
-    if: |
-      github.event.inputs.discord_message == 'true'
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 22
-        uses: actions/setup-java@v4
-        with:
-          java-version: 22
-          distribution: "temurin"
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Send Discord Message
-        run: ./gradlew discordRelease
-        env:
-          DISCORD_WEB_HOOK: ${{ secrets.DISCORD_WEB_HOOK }}
diff --git a/root.gradle.kts b/root.gradle.kts
@@ -1,3 +1,3 @@
 plugins {
-    id("dev.tocraft.modmaster.root") version "0.3.0"
+    id("dev.tocraft.modmaster.root") version "0.3.4"
 }