Further changelog generation tweaks

Glitchfiend · Nov 19, 2023 · b1c1dea · b1c1dea
1 parent 4c2f505
commit b1c1dea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -22,6 +22,8 @@ jobs:
         settings-path: ${{ github.workspace }} # location for the settings.xml file
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
+    - name: Generate Changelog
+      run: ./gradlew createChangelog
     - name: Publish
       run: ./gradlew publish
       env:

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -59,8 +59,6 @@ jar {
     }
 }
 
-def changelog_file = rootProject.file("build/TerraBlender-${version}-changelog.txt")
-
 curseforge {
     if (project.hasProperty('curseApiKey')) {
         apiKey = project.getProperty('curseApiKey')
@@ -104,8 +102,7 @@ modrinth {
     loaders = ['fabric']
 
     if (changelog_file.exists()) {
-        def changelog_text = changelog_file.text
-        changelog = "```\n" + changelog_text.substring(0, changelog_text.indexOf("=========")).replace("\t", "    ") + "```"
+        changelog = changelog_file.text
     }
 
     dependencies {

diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -90,8 +90,6 @@ processResources {
 
 jar.finalizedBy('reobfJar')
 
-def changelog_file = rootProject.file("build/TerraBlender-${version}-changelog.txt")
-
 curseforge {
     if (project.hasProperty('curseApiKey')) {
         apiKey = project.getProperty('curseApiKey')
@@ -125,8 +123,7 @@ modrinth {
     loaders = ['forge']
 
     if (changelog_file.exists()) {
-        def changelog_text = changelog_file.text
-        changelog = "```\n" + changelog_text.substring(0, changelog_text.indexOf("=========")).replace("\t", "    ") + "```"
+        changelog = changelog_file.text
     }
     // debugMode = true
 }

diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
@@ -74,6 +74,10 @@ curseforge {
     project {
         id = '940057'
 
+        if (changelog_file.exists()) {
+            changelog = changelog_file
+        }
+
         releaseType = release_channel
         addGameVersion minecraft_version
 
@@ -94,6 +98,10 @@ modrinth {
     uploadFile = jar
     gameVersions = [minecraft_version]
     loaders = ['neoforge']
+
+    if (changelog_file.exists()) {
+        changelog = changelog_file.text
+    }
 }
 
 publishing {

diff --git a/build.gradle b/build.gradle
@@ -5,15 +5,16 @@ plugins {
     id 'net.minecraftforge.gradleutils' version '[2.1.3,)'
 }
 
-version = "${minecraft_version}-${mod_version}.${System.getenv().BUILD_NUMBER}"
+changelog {
+    fromMergeBase()
+}
 
 ext {
-    mod_version = gradleutils.getFilteredTagOffsetVersion(true, '[0-9]', MC_VERSION)
+    mod_version = gradleutils.getTagOffsetVersion()
+    changelog_file = rootProject.file("build/changelog.txt")
 }
 
-changelog {
-    fromMergeBase()
-}
+version = "${minecraft_version}-${mod_version}"
 
 subprojects {
     apply plugin: 'java'
@@ -25,16 +26,15 @@ subprojects {
     java.withJavadocJar()
 
     version = rootProject.version
-    def mod_build_version = "${mod_version}.${System.getenv().BUILD_NUMBER}"
 
     jar {
         manifest {
             attributes([
                 'Specification-Title'     : mod_name,
                 'Specification-Vendor'    : mod_author,
-                'Specification-Version'   : mod_build_version,
+                'Specification-Version'   : mod_version,
                 'Implementation-Title'    : project.name,
-                'Implementation-Version'  : mod_build_version,
+                'Implementation-Version'  : mod_version,
                 'Implementation-Vendor'   : mod_author,
                 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
                 'Timestamp'               : System.currentTimeMillis(),