Try to unify version input from CI

Author: robotgryphon

.github/workflows/ci-tests-nightly.yml

@@ -29,7 +29,6 @@ jobs:
     runs-on: ubuntu-22.04
     outputs:
       version: ${{steps.version.outputs.version}}
-      build: ${{steps.version.outputs.increment}}
       mcVersion: ${{steps.gradle_props.outputs.minecraft_version}}
       forgeVersion: ${{steps.gradle_props.outputs.forge_version}}
 
@@ -44,7 +43,7 @@ jobs:
         uses: paulhatch/[email protected]
         with:
           change_path: "forge-api/ forge-main/"
-          version_format: "${major}.${minor}.${patch}"
+          version_format: "${major}.${minor}.${patch}.${increment}"
           search_commit_body: true
 
       - name: Read MC and Forge versions
@@ -62,7 +61,6 @@ jobs:
         - name: Output
           run: |
             echo "Version: ${{ needs.vars.outputs.version }}"
-            echo "Build Number: ${{ needs.vars.outputs.build }}"
             echo "Packages URL: ${{ env.GH_PKG_URL }}"
 
   tests:
@@ -100,8 +98,7 @@ jobs:
       - name: Generate Datagen Assets
         run: ./gradlew runData
         env:
-          CC_SEMVER_VERSION: ${{ needs.vars.outputs.version }}
-          CC_BUILD_NUM: ${{ needs.vars.outputs.build }}
+          CC_VERSION: ${{ needs.vars.outputs.version }}
 
       - name: Store Built Assets
         if: success()
@@ -120,8 +117,7 @@ jobs:
       - name: Test JAR with GameTest Server
         run: ./gradlew runGameTestServer
         env:
-          CC_SEMVER_VERSION: ${{ needs.vars.outputs.version }}
-          CC_BUILD_NUM: ${{ needs.vars.outputs.build }}
+          CC_VERSION: ${{ needs.vars.outputs.version }}
 
       - name: Upload build failure
         if: failure()
@@ -159,10 +155,10 @@ jobs:
       - name: Publish gradle nightly jar
         run: ./gradlew publishAllLibsPublicationToGitHubPackagesRepository
         env:
-          CC_SEMVER_VERSION: ${{ needs.vars.outputs.version }}
-          CC_BUILD_NUM: ${{ needs.vars.outputs.build }}
+          CC_VERSION: ${{ needs.vars.outputs.version }}
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   get-package-info:
     name: Get Latest Package Info
     runs-on: ubuntu-22.04
@@ -186,6 +182,7 @@ jobs:
         run: |
           echo "Version: ${{ steps.download-info.outputs.version }}"
           cat compactcrafting-nightly.json
+
       - name: Read info into variable [latest]
         id: info
         run: echo "latestJson=$(cat compactcrafting-nightly.json)" >> $GITHUB_OUTPUT

.github/workflows/release-cf-alpha.yml

@@ -12,23 +12,11 @@ on:
         default: false
         required: true
 
-  push:
-    branches:
-      - '**'
-    tags-ignore:
-      - v*
-    paths-ignore:
-      - "README.md"
-      - "LICENSE"
-      - ".github/**/*"
-
 jobs:
   vars:
     name: Get Variables
     runs-on: ubuntu-22.04
     outputs:
-      version: ${{steps.version.outputs.version}}
-      build: ${{steps.version.outputs.increment}}
       cf_project: ${{steps.gradle_props.outputs.cf_project}}
       mcVersion: ${{steps.gradle_props.outputs.minecraft_version}}
       forgeVersion: ${{steps.gradle_props.outputs.forge_version}}
@@ -39,14 +27,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Version
-        id: version
-        uses: paulhatch/[email protected]
-        with:
-          change_path: "forge-api/ forge-main/"
-          version_format: "${major}.${minor}.${patch}"
-          search_commit_body: true
-
       - name: Read MC and Forge versions
         id: gradle_props
         uses: christian-draeger/[email protected]
@@ -77,6 +57,7 @@ jobs:
         run: |
           echo "Version: ${{ steps.download-info.outputs.version }}"
           cat compactcrafting-nightly.json
+
       - name: Read info into variable [latest]
         id: info
         run: echo "latestJson=$(cat compactcrafting-nightly.json)" >> $GITHUB_OUTPUT

build.gradle.kts

@@ -1,26 +1,14 @@
-var semver: String = System.getenv("CC_SEMVER_VERSION") ?: "9.9.9"
-if(semver.startsWith("v"))
-    semver = semver.trimStart('v');
+var envVersion: String = System.getenv("CC_VERSION") ?: "9.9.9"
+if(envVersion.startsWith("v"))
+    envVersion = envVersion.trimStart('v');
 
 val mod_id: String by extra
-val buildNumber: String = System.getenv("CC_BUILD_NUM") ?: "0"
-val nightlyVersion: String = "${semver}.${buildNumber}-nightly"
 val isRelease: Boolean = (System.getenv("CC_RELEASE") ?: "false").equals("true", true)
-val modVersion = if (isRelease) semver else nightlyVersion
 
 plugins {
     id("maven-publish")
 }
 
-tasks.create("getBuildInfo") {
-    doFirst {
-        this.logger.info("Mod ID: ${mod_id}")
-        this.logger.info("Version: ${modVersion}")
-        this.logger.info("Semver Version: ${semver}")
-        this.logger.info("Nightly Build: ${nightlyVersion}")
-    }
-}
-
 val deps = listOf(
         project(":forge-api"),
         project(":forge-main")
@@ -35,7 +23,7 @@ publishing {
     publications.register<MavenPublication>("allLibs") {
         artifactId = mod_id
         groupId = "dev.compactmods"
-        version = modVersion
+        version = envVersion
 
         this.artifact(project(":forge-api").tasks.named("jar").get())
         this.artifact(project(":forge-api").tasks.named("sourcesJar").get())

forge-api/build.gradle.kts

@@ -10,24 +10,21 @@ plugins {
     id("org.parchmentmc.librarian.forgegradle") version ("1.+")
 }
 
-var semver: String = System.getenv("CC_SEMVER_VERSION") ?: "9.9.9"
-if(semver.startsWith("v"))
-    semver = semver.trimStart('v');
+var envVersion: String = System.getenv("CC_VERSION") ?: "9.9.9"
+if(envVersion.startsWith("v"))
+    envVersion = envVersion.trimStart('v');
 
 var mod_id: String by extra
-val buildNumber: String = System.getenv("CC_BUILD_NUM") ?: "0"
-val nightlyVersion: String = "${semver}.${buildNumber}-nightly"
 val isRelease: Boolean = (System.getenv("CC_RELEASE") ?: "false").equals("true", true)
 
-
 var minecraft_version: String by extra
 var forge_version: String by extra
 var parchment_version: String by extra
 
 base {
     archivesName.set(mod_id)
     group = "dev.compactmods"
-    version = if(isRelease) semver else nightlyVersion
+    version = envVersion
 }
 
 java {

forge-main/build.gradle.kts

@@ -10,15 +10,12 @@ plugins {
     id("org.parchmentmc.librarian.forgegradle") version ("1.+")
 }
 
-var semver: String = System.getenv("CC_SEMVER_VERSION") ?: "9.9.9"
-if(semver.startsWith("v"))
-    semver = semver.trimStart('v');
+var envVersion: String = System.getenv("CC_VERSION") ?: "9.9.9"
+if(envVersion.startsWith("v"))
+    envVersion = envVersion.trimStart('v');
 
 val mod_id: String by extra
-val buildNumber: String = System.getenv("CC_BUILD_NUM") ?: "0"
-val nightlyVersion: String = "${semver}.${buildNumber}-nightly"
 val isRelease: Boolean = (System.getenv("CC_RELEASE") ?: "false").equals("true", true)
-val modVersion = if (isRelease) semver else nightlyVersion
 
 val minecraft_version: String by extra
 val forge_version: String by extra
@@ -27,11 +24,11 @@ val parchment_version: String by extra
 base {
     archivesName.set(mod_id)
     group = "dev.compactmods"
-    version = modVersion
+    version = envVersion
 }
 
 println("Mod ID: $mod_id");
-println("Version: $modVersion");
+println("Version: $envVersion");
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(17))