Infer archive name from release tag

CaffeineMC · Oct 3, 2021 · 2e67611 · 2e67611
1 parent 37fb45a
commit 2e67611
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -14,8 +14,13 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: 16
+    - name: Set release tag
+      if: startsWith(github.ref, 'refs/tags/')
+      run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
     - name: Build with Gradle
       run: ./gradlew build
+      env:
+        BUILD_ID: ${{ github.run_number }}
     - name: Upload build artifacts
       uses: actions/upload-artifact@v1
       with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,8 +2,7 @@ name: release-artifacts
 
 on:
   release:
-     types:
-       - published
+    types: [published]
 
 jobs:
   build:
@@ -16,6 +15,12 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: 16
+      - name: Set release tag
+        if: startsWith(github.ref, 'refs/tags/')
+        run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+      - name: Set build id
+        if: github.event.release.prerelease
+        run: echo "BUILD_ID=SNAPSHOT" >> $GITHUB_ENV
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload assets to GitHub

diff --git a/build.gradle b/build.gradle
@@ -5,15 +5,16 @@ plugins {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}"
+archivesBaseName = project.archives_base_name
 group = project.maven_group
 
-def build_id = System.getenv("GITHUB_RUN_NUMBER");
+def release_tag = System.getenv("RELEASE_TAG")
+def build_id = System.getenv("BUILD_ID")
 
-if (build_id == null) {
-    version = "${project.mod_version}-SNAPSHOT"
-} else {
-    version = "${project.mod_version}+build.${build_id}"
+version = release_tag == null ? "mc${project.minecraft_version}-${project.mod_version}" : release_tag
+
+if (build_id != null) {
+    version += build_id == 'SNAPSHOT' ? '-SNAPSHOT' : "+build.${build_id}"
 }
 
 loom {
@@ -32,10 +33,10 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
+    inputs.property "version", project.mod_version
 
     filesMatching("fabric.mod.json") {
-        expand "version": project.version
+        expand "version": project.mod_version
     }
 }