More release workflow tweaks

62832 · Aug 22, 2023 · 9c6d655 · 9c6d655
1 parent 9fbc168
commit 9c6d655
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
         env:
           ARSENG_VERSION: ${{ github.event.release.tag_name }}
         run: ./gradlew releaseInfo build
-      - name: Publish release files (Forge)
+      - name: Publish release files
         uses: Kir-Antipov/mc-publish@4db8bd126f74d5e143822181a2b1201308e2c796
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -40,6 +40,7 @@ jobs:
           modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
 
           name: ${{ steps.build.outputs.MOD_VERSION }} (Forge ${{ steps.build.outputs.MINECRAFT_VERSION }})
+          version: ${{ steps.build.outputs.MOD_VERSION }}
           game-versions: ${{ steps.build.outputs.MINECRAFT_VERSION }}
           dependencies: |
             ae2(required){curseforge:223794}{modrinth:XxWD5pD3}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,10 +7,8 @@ plugins {
 }
 
 val modId = "arseng"
-val modVersion = (System.getenv("ARSENG_VERSION") ?: "v0.0.0").substring(1).substringBeforeLast('-')
-val minecraftVersion: String = libs.versions.minecraft.get()
 
-version = "$modVersion-$minecraftVersion"
+version = (System.getenv("ARSENG_VERSION") ?: "v0.0.0").substring(1)
 group = "gripe.90"
 base.archivesName.set(modId)
 
@@ -133,8 +131,8 @@ tasks {
 
             if (!output.isNullOrEmpty()) {
                 val outputFile = File(output)
-                outputFile.appendText("MOD_VERSION=$modVersion\n")
-                outputFile.appendText("MINECRAFT_VERSION=$minecraftVersion\n")
+                outputFile.appendText("MOD_VERSION=$version\n")
+                outputFile.appendText("MINECRAFT_VERSION=${libs.versions.minecraft.get()}\n")
             }
         }
     }