chore: release prep (better pipelines)

MichaelHillcox · MichaelHillcox · commit 971ee2f71e3e · 2023-11-13T00:32:09.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,23 +7,17 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: |
-      !contains(github.event.head_commit.message, '[ciskip]')
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK
+      - name: Set up JDK  17
         uses: actions/setup-java@v2
         with:
-          distribution: 'temurin'
           java-version: '17'
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
-      - name: Publish to Maven
+          distribution: 'temurin'
+      - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
-        env:
-          SNAPSHOT: true
-          SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
         with:
-          arguments: publish
+          cache-read-only: false
+          gradle-home-cache-cleanup: true
+      - name: Build & Publish to Github Maven
+        run: ./gradlew build --no-daemon
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,30 +8,19 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: |
-      !contains(github.event.head_commit.message, '[ciskip]')
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK
+      - name: Set up JDK  17
         uses: actions/setup-java@v2
         with:
-          distribution: 'temurin'
           java-version: '17'
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
-      - name: Publish to Maven & Curseforge
+          distribution: 'temurin'
+      - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
+      - name: Build & Publish
+        run: ./gradlew build publish publishMods --no-daemon
         env:
           SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
-          CURSEFORGE_KEY: ${{ secrets.CURSEFORGE_KEY }}
-        with:
-          arguments: publish curseforgePublish
-      - name: Release to Github
-        uses: "softprops/action-gh-release@v1"
-        with:
-          body_path: "./CHANGELOG.md"
-          prerelease: false
-          files: |
-            ./+(forge|fabric)/build/libs/*+@(mc+([0-9]).+([0-9]).+([0-9])).jar
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CURSE_TOKEN: ${{ secrets.CURSEFORGE_KEY }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,5 @@
-# Accelerated Decay Changelog
-
-## [1.0.0]
+## [1.0.1]
 
 ### Changed
 
-- Updated to 1.19.2
+- Improved multi-threading safety and performance thanks to [(#7)](https://github.com/ErrorMikey/AcceleratedDecay/pull/7) [BumbleTree](https://github.com/BumbleTree)
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
+    id "me.modmuss50.mod-publish-plugin" version "0.3.5"
 }
 
 architectury {
@@ -9,6 +10,7 @@ architectury {
 
 subprojects {
     apply plugin: "dev.architectury.loom"
+    apply plugin: "maven-publish"
 
     loom {
         silentMojangMappingsLicense()
@@ -21,25 +23,31 @@ subprojects {
         // The following line declares the yarn mappings you may select this one as well.
         // mappings "net.fabricmc:yarn:1.18.2+build.4:v2"
     }
+
+    publishing {
+        repositories {
+            if (providers.environmentVariable("SAPS_TOKEN").isPresent()) {
+                maven {
+                    url "https://maven.saps.dev/${providers.environmentVariable("SNAPSHOT").map { "snapshots" }.getOrElse("releases")}"
+                    credentials {
+                        username = "errormikey"
+                        password = "${providers.environmentVariable("SAPS_TOKEN").get()}"
+                    }
+                }
+            }
+        }
+    }
 }
 
 allprojects {
     apply plugin: "java"
     apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
 
-    ext.ENV = System.getenv()
-    ext.SNAPSHOT = ENV.SNAPSHOT != null && (ENV.SNAPSHOT == "true" || ENV.SNAPSHOT == true)
-    ext.MAVEN_URL = "https://maven.saps.dev/${SNAPSHOT ? "snapshots" : "releases"}"
-    ext.MAVEN_VERSION = rootProject.version + (SNAPSHOT ? "-SNAPSHOT" : "")
-
     archivesBaseName = rootProject.archives_base_name
     version = "${rootProject.mod_version}+mc${rootProject.minecraft_version}"
     group = rootProject.maven_group
 
-    repositories {
-    }
-
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
         options.release = 17
@@ -50,4 +58,74 @@ allprojects {
     }
 }
 
-task curseforgePublish
+publishMods {
+    dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
+    changelog = file("./CHANGELOG.md").text
+    version = "${mod_version}"
+    type = STABLE
+
+    def fabricOptions = publishOptions {
+        file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
+        displayName = "${project.name} Fabric ${mod_version}+mc${minecraft_version}"
+        modLoaders.add("fabric")
+    }
+
+    def forgeOptions = publishOptions {
+        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+        displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
+        modLoaders.add("neoforge")
+    }
+
+    def curseForgeOptions = curseforgeOptions {
+        accessToken = providers.environmentVariable("CURSE_TOKEN")
+        projectId = "${curseforge_id}"
+        minecraftVersions.add("${minecraft_version}")
+    }
+
+    def modrinthOptions = modrinthOptions {
+        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+        projectId = "${modrinth_id}"
+        minecraftVersions.add("${minecraft_version}")
+    }
+
+    curseforge("curseforgeFabric") {
+        from(curseForgeOptions, fabricOptions)
+        requires {
+            slug = "architectury-api"
+            slug = "fabric-api"
+        }
+    }
+
+    curseforge("curseforgeForge") {
+        from(curseForgeOptions, forgeOptions)
+        requires {
+            slug = "architectury-api"
+        }
+    }
+
+    modrinth("modrinthFabric") {
+        from(modrinthOptions, fabricOptions)
+        requires {
+            slug = "architectury-api"
+            slug = "fabric-api"
+        }
+    }
+
+    modrinth("modrinthForge") {
+        from(modrinthOptions, forgeOptions)
+        requires {
+            slug = "architectury-api"
+        }
+    }
+
+    github {
+        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+        additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
+
+        repository = "${project.github_repo}"
+        accessToken = providers.environmentVariable("GITHUB_TOKEN")
+        commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")
+        tagName = providers.environmentVariable("GITHUB_REF_NAME").orElse("dryRun")
+    }
+}
+
diff --git a/common/build.gradle b/common/build.gradle
@@ -17,20 +17,6 @@ publishing {
         mavenCommon(MavenPublication) {
             artifactId = "${rootProject.archivesBaseName}-${project.name}"
             from components.java
-
-            version = MAVEN_VERSION
-        }
-    }
-
-    repositories {
-        if (ENV.SAPS_TOKEN) {
-            maven {
-                url MAVEN_URL
-                credentials {
-                    username = "errormikey"
-                    password = "${ENV.SAPS_TOKEN}"
-                }
-            }
         }
     }
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "com.matthewprenger.cursegradle" version "1.4.0"
 }
 
 architectury {
@@ -42,19 +41,19 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    setArchiveClassifier "dev-shadow"
 }
 
 remapJar {
     injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    setArchiveClassifier null
     setArchivesBaseName("${rootProject.archivesBaseName}-${project.name}") // adds fabric to the maven and curse name
 }
 
 jar {
-    classifier "dev"
+    setArchiveClassifier "dev"
 }
 
 sourcesJar {
@@ -74,41 +73,7 @@ publishing {
         mavenFabric(MavenPublication) {
             artifactId = "${rootProject.archivesBaseName}-${project.name}" // adds fabric or forge to the maven name
             from components.java
-
-            version = MAVEN_VERSION
-        }
-    }
-
-    repositories {
-        if (ENV.SAPS_TOKEN) {
-            maven {
-                url MAVEN_URL
-                credentials {
-                    username = "errormikey"
-                    password = "${ENV.SAPS_TOKEN}"
-                }
-            }
-        }
-    }
-}
-
-if (ENV.CURSEFORGE_KEY) {
-    curseforge {
-        apiKey = ENV.CURSEFORGE_KEY
-        project {
-            id = rootProject.curseforge_id
-            releaseType = "beta"
-            addGameVersion "Fabric"
-            addGameVersion "Java 17"
-            addGameVersion rootProject.minecraft_version
-            mainArtifact(remapJar.archiveFile)
-            relations {
-                requiredDependency("architectury-api")
-            }
-            changelog = file("./../CHANGELOG.md")
-            changelogType = 'markdown'
         }
     }
 }
 
-rootProject.tasks.curseforgePublish.dependsOn tasks.curseforge
diff --git a/forge/build.gradle b/forge/build.gradle
diff --git a/gradle.properties b/gradle.properties
