From d114a4156a721f90ca3a31d6707303d0a3fb1fb6 Mon Sep 17 00:00:00 2001 From: moonleay Date: Wed, 8 May 2024 22:08:05 +0200 Subject: [PATCH] ci: hopefully improved Signed-off-by: moonleay --- .forgejo/workflows/build-release.yml | 3 +-- build.gradle.kts | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index 54bd430..1f20e16 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -1,6 +1,5 @@ on: - push: - tags: '*' + release: jobs: release: diff --git a/build.gradle.kts b/build.gradle.kts index af79cf7..88e08b6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,8 +30,8 @@ plugins { id("com.modrinth.minotaur") version "2.+" } -val ver = if ((System.getenv("GITHUB_EVENT_NAME") ?: "local") == "tag") System.getenv("GITHUB_REF_NAME") - ?: "err" else System.getenv("GIT_SHA_SHORT") ?: "0.0.0" +val ver = if ((System.getenv("GITHUB_REF") ?: "local").startsWith("refs/tags/")) + System.getenv("GITHUB_REF_NAME") ?: "err" else System.getenv("GIT_SHA_SHORT") ?: "0.0.0" val mavenVersion = "$ver-${project.ext["minecraft.version"] as String}" val modId: String by project