From 79fe682cb16d07fa852d087baaf34d2b2d72eb1f Mon Sep 17 00:00:00 2001 From: Chrys Chrysanthemum Date: Tue, 7 Jul 2026 14:28:47 +1000 Subject: [PATCH] chore: Move Cowponents Gradle rewrites over here. --- .forgejo/workflows/build.yml | 4 ++-- .forgejo/workflows/publish-all.yml | 4 ++-- .forgejo/workflows/publish-forgejo.yml | 4 ++-- .../workflows/publish-maven-dev-build.yml | 4 ++-- .forgejo/workflows/publish-maven.yml | 4 ++-- .forgejo/workflows/publish-modrinth.yml | 4 ++-- .../greenhouse/config/gradle/Properties.kt | 19 ++++++++++++------- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 9fd5327..c8feed8 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -15,13 +15,13 @@ jobs: uses: https://code.forgejo.org/actions/checkout@v5 - name: Set up JDK 25 - uses: https://git.greenhouse.lgbt/Modding/setup-java@v5 + uses: https://git.greenhouse.lgbt/Mirrors/setup-java@v5 with: java-version: '25' distribution: 'temurin' - name: Setup Gradle - uses: https://git.greenhouse.lgbt/Modding/gradle-actions/setup-gradle@v4 + uses: https://git.greenhouse.lgbt/Mirrors/gradle-actions/setup-gradle@v4 with: cache-read-only: false diff --git a/.forgejo/workflows/publish-all.yml b/.forgejo/workflows/publish-all.yml index 87b3cfb..3ffe45f 100644 --- a/.forgejo/workflows/publish-all.yml +++ b/.forgejo/workflows/publish-all.yml @@ -18,13 +18,13 @@ jobs: uses: https://code.forgejo.org/actions/checkout@v5 - name: Set up JDK 25 - uses: https://git.greenhouse.lgbt/Modding/setup-java@v5 + uses: https://git.greenhouse.lgbt/Mirrors/setup-java@v5 with: java-version: '25' distribution: 'temurin' - name: Setup Gradle - uses: https://git.greenhouse.lgbt/Modding/gradle-actions/setup-gradle@v4 + uses: https://git.greenhouse.lgbt/Mirrors/gradle-actions/setup-gradle@v4 with: cache-read-only: false diff --git a/.forgejo/workflows/publish-forgejo.yml b/.forgejo/workflows/publish-forgejo.yml index 195b609..e625f44 100644 --- a/.forgejo/workflows/publish-forgejo.yml +++ b/.forgejo/workflows/publish-forgejo.yml @@ -18,13 +18,13 @@ jobs: uses: https://code.forgejo.org/actions/checkout@v5 - name: Set up JDK 25 - uses: https://git.greenhouse.lgbt/Modding/setup-java@v5 + uses: https://git.greenhouse.lgbt/Mirrors/setup-java@v5 with: java-version: '25' distribution: 'temurin' - name: Setup Gradle - uses: https://git.greenhouse.lgbt/Modding/gradle-actions/setup-gradle@v4 + uses: https://git.greenhouse.lgbt/Mirrors/gradle-actions/setup-gradle@v4 with: cache-read-only: false diff --git a/.forgejo/workflows/publish-maven-dev-build.yml b/.forgejo/workflows/publish-maven-dev-build.yml index c56e709..b9b7923 100644 --- a/.forgejo/workflows/publish-maven-dev-build.yml +++ b/.forgejo/workflows/publish-maven-dev-build.yml @@ -19,13 +19,13 @@ jobs: uses: https://code.forgejo.org/actions/checkout@v5 - name: Set up JDK 25 - uses: https://git.greenhouse.lgbt/Modding/setup-java@v5 + uses: https://git.greenhouse.lgbt/Mirrors/setup-java@v5 with: java-version: '25' distribution: 'temurin' - name: Setup Gradle - uses: https://git.greenhouse.lgbt/Modding/gradle-actions/setup-gradle@v4 + uses: https://git.greenhouse.lgbt/Mirrors/gradle-actions/setup-gradle@v4 with: cache-read-only: false diff --git a/.forgejo/workflows/publish-maven.yml b/.forgejo/workflows/publish-maven.yml index 387a717..eae561c 100644 --- a/.forgejo/workflows/publish-maven.yml +++ b/.forgejo/workflows/publish-maven.yml @@ -18,13 +18,13 @@ jobs: uses: https://code.forgejo.org/actions/checkout@v5 - name: Set up JDK 25 - uses: https://git.greenhouse.lgbt/Modding/setup-java@v5 + uses: https://git.greenhouse.lgbt/Mirrors/setup-java@v5 with: java-version: '25' distribution: 'temurin' - name: Setup Gradle - uses: https://git.greenhouse.lgbt/Modding/gradle-actions/setup-gradle@v4 + uses: https://git.greenhouse.lgbt/Mirrors/gradle-actions/setup-gradle@v4 with: cache-read-only: false diff --git a/.forgejo/workflows/publish-modrinth.yml b/.forgejo/workflows/publish-modrinth.yml index 0e98634..d3370bc 100644 --- a/.forgejo/workflows/publish-modrinth.yml +++ b/.forgejo/workflows/publish-modrinth.yml @@ -18,13 +18,13 @@ jobs: uses: https://code.forgejo.org/actions/checkout@v5 - name: Set up JDK 25 - uses: https://git.greenhouse.lgbt/Modding/setup-java@v5 + uses: https://git.greenhouse.lgbt/Mirrors/setup-java@v5 with: java-version: '25' distribution: 'temurin' - name: Setup Gradle - uses: https://git.greenhouse.lgbt/Modding/gradle-actions/setup-gradle@v4 + uses: https://git.greenhouse.lgbt/Mirrors/gradle-actions/setup-gradle@v4 with: cache-read-only: false diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt b/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt index 86e9824..cd9a114 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt @@ -2,7 +2,7 @@ package lgbt.greenhouse.config.gradle object Properties { val MOD_VERSION = mapModVersion("3.0.0") - const val FRIENDLY_MINECRAFT_VERSION = "26.1.x" + val FRIENDLY_MINECRAFT_VERSION = mapMinecraftVersion("26.1.x") const val JAVA_VERSION = 25 const val GROUP = "lgbt.greenhouse.config" @@ -35,15 +35,20 @@ object Properties { } fun mapModVersion(modVersion: String): String { - if (System.getenv("MAVEN_RELEASE_TYPE") != "releases") { - val forgejoShaEnv = System.getenv("FORGEJO_SHA") - val hash = forgejoShaEnv ?: "local" - - return "${modVersion}-dev.${hash}" + if (System.getenv("RELEASE_TYPE") != "releases") { + return "${modVersion}-dev" } return modVersion } +fun mapMinecraftVersion(minecraftVersion: String): String { + if (System.getenv("FORGEJO_SHA") != null) { + val sha = "${System.getenv("FORGEJO_SHA")}" + return "${minecraftVersion}-${sha}" + } + return minecraftVersion +} + fun mapMavenUrl(mavenUrl: String): String { - return mavenUrl + System.getenv("MAVEN_RELEASE_TYPE") + return mavenUrl + System.getenv("RELEASE_TYPE") } -- 2.51.2