From 2c108ee26dde20e8fb7ff07197047f5733762ebf Mon Sep 17 00:00:00 2001 From: Anastasia Chrysanthemum Date: Thu, 28 May 2026 13:17:39 +1000 Subject: [PATCH] refactor: Swap out ENVIRONMENT env var to MAVEN_RELEASE_TYPE. --- .forgejo/workflows/publish-all.yml | 2 +- .forgejo/workflows/publish-forgejo.yml | 2 +- .forgejo/workflows/publish-maven-dev-build.yml | 3 +++ .forgejo/workflows/publish-maven.yml | 2 +- .forgejo/workflows/publish-modrinth.yml | 2 +- .../lgbt/greenhouse/cowponents/gradle/Properties.kt | 12 ++++++++---- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/publish-all.yml b/.forgejo/workflows/publish-all.yml index cbe7ea7..c17046f 100644 --- a/.forgejo/workflows/publish-all.yml +++ b/.forgejo/workflows/publish-all.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: env: - ENVIRONMENT: publishing + MAVEN_RELEASE_TYPE: releases jobs: build: diff --git a/.forgejo/workflows/publish-forgejo.yml b/.forgejo/workflows/publish-forgejo.yml index 93b2f70..195b609 100644 --- a/.forgejo/workflows/publish-forgejo.yml +++ b/.forgejo/workflows/publish-forgejo.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: env: - ENVIRONMENT: publishing + MAVEN_RELEASE_TYPE: releases jobs: build: diff --git a/.forgejo/workflows/publish-maven-dev-build.yml b/.forgejo/workflows/publish-maven-dev-build.yml index 7586dd4..1227c3f 100644 --- a/.forgejo/workflows/publish-maven-dev-build.yml +++ b/.forgejo/workflows/publish-maven-dev-build.yml @@ -3,6 +3,9 @@ name: Publish to Maven (Dev Build) on: workflow_dispatch: +env: + MAVEN_RELEASE_TYPE: snapshots + jobs: build: diff --git a/.forgejo/workflows/publish-maven.yml b/.forgejo/workflows/publish-maven.yml index 7c766aa..387a717 100644 --- a/.forgejo/workflows/publish-maven.yml +++ b/.forgejo/workflows/publish-maven.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: env: - ENVIRONMENT: publishing + MAVEN_RELEASE_TYPE: releases jobs: build: diff --git a/.forgejo/workflows/publish-modrinth.yml b/.forgejo/workflows/publish-modrinth.yml index 3cabf11..0e98634 100644 --- a/.forgejo/workflows/publish-modrinth.yml +++ b/.forgejo/workflows/publish-modrinth.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: env: - ENVIRONMENT: publishing + MAVEN_RELEASE_TYPE: releases jobs: build: diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/Properties.kt b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/Properties.kt index 5b873a1..8952ea0 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/Properties.kt +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/Properties.kt @@ -22,10 +22,10 @@ object Properties { const val MODRINTH_PROJECT_ID = "??????" const val FORGEJO_URL = "https://git.greenhouse.lgbt" - const val FORGEJO_REPO = "GreenhouseModding/cowponents" + const val FORGEJO_REPO = "Modding/cowponents" const val FORGEJO_COMMITISH = "26.1.x" - const val MAVEN_URL = "https://maven.greenhouse.lgbt/snapshots" + val MAVEN_URL = mapMavenUrl("https://maven.greenhouse.lgbt/") val MODULES = mapOf( "core" to ModuleProperties( @@ -89,11 +89,15 @@ object Properties { } fun mapModVersion(modVersion: String): String { - if (System.getenv("ENVIRONMENT") != "publishing") { + if (System.getenv("MAVEN_RELEASE_TYPE") != "releases") { val forgejoShaEnv = System.getenv("FORGEJO_SHA") - val hash = if (forgejoShaEnv == null) forgejoShaEnv else "local" + val hash = forgejoShaEnv ?: "local" return "${modVersion}-dev.${hash}" } return modVersion } + +fun mapMavenUrl(mavenUrl: String): String { + return mavenUrl + System.getenv("MAVEN_RELEASE_TYPE") +} -- 2.51.2