From 5c59b45e620f24ae68c14642c5c6db484b3f502b Mon Sep 17 00:00:00 2001 From: LambdAurora Date: Sat, 23 Dec 2023 23:11:57 +0100 Subject: [PATCH] Add missing ref env and tweak check ref task. --- .github/workflows/release.yml | 3 +++ build_logic/src/main/kotlin/task/CheckActionsRefTask.kt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ba5f97..8648617 100644 --- 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 index e863696..0c74e38 100644 --- 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.") } }