From bd047908bb9cc83f54614aea1fe89b2190cf25c8 Mon Sep 17 00:00:00 2001
From: LTFan <xfqwdsj@qq.com>
Date: Sat, 20 Jan 2024 19:48:14 +0800
Subject: [PATCH] ci: change method getting commit sha

---
 .github/workflows/build-and-release.yaml | 2 +-
 build.gradle.kts                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
index 24115a7..08e01dd 100644
--- a/.github/workflows/build-and-release.yaml
+++ b/.github/workflows/build-and-release.yaml
@@ -58,7 +58,7 @@ jobs:
         id: build
         shell: bash
         run: |
-          ./gradlew ciVersioning -Poutput=$GITHUB_OUTPUT
+          ./gradlew ciVersioning
           ./gradlew ciReleaseApp
 
       - if: github.ref == 'refs/heads/main' && github.event_name == 'push'
diff --git a/build.gradle.kts b/build.gradle.kts
index d2fc235..5243d17 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -86,7 +86,7 @@ tasks.register("updateCommitSha") {
     doLast {
         val stream = ByteArrayOutputStream()
         exec {
-            commandLine("git", "rev-parse", "--short", "main")
+            commandLine("git", "rev-parse", "--short")
             standardOutput = stream
         }
         commitSha = stream.toString().trim()
@@ -267,7 +267,7 @@ tasks.register("ciVersioning") {
     dependsOn("updateVersion")
 
     doLast {
-        val outputDir = file(project.property("output").toString())
+        val outputDir = file(System.getenv("GITHUB_OUTPUT"))
         outputDir.writeText("version=${version.substringBefore('+')}")
         logger.lifecycle("Wrote version to ${outputDir.absolutePath}")
     }