Add missing ref env and tweak check ref task.

YumiProject · Dec 23, 2023 · 5c59b45 · 5c59b45
1 parent 37fee7a
commit 5c59b45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,6 +20,8 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           arguments: build check --stacktrace --parallel
+        env:
+          ACTIONS_REF: ${{ github.ref }}
       - uses: actions/upload-artifact@v3
         with:
           name: Artifacts
@@ -30,6 +32,7 @@ jobs:
         with:
           arguments: publish publishToSonatype closeSonatypeStagingRepository --stacktrace
         env:
+          ACTIONS_REF: ${{ github.ref }}
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.MAVEN_CENTRAL_PUBLISH_KEY }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.MAVEN_CENTRAL_PUBLISH_SECRET }}
           ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_PGP_KEY_ID }}

diff --git a/build_logic/src/main/kotlin/task/CheckActionsRefTask.kt b/build_logic/src/main/kotlin/task/CheckActionsRefTask.kt
@@ -16,9 +16,9 @@ open class CheckActionsRefTask : DefaultTask() {
 
 	@TaskAction
 	fun execute() {
-		val refName = System.getenv("ACTIONS_REF_NAME") ?: throw GradleException("Could not find GitHub Actions ref name.")
+		val refName = System.getenv("ACTIONS_REF")
 
-		if (refName != "v${Constants.VERSION}") {
+		if (refName != null && refName != "refs/tags/v${Constants.VERSION}") {
 			throw GradleException("Failed to validate ref name.")
 		}
 	}