ci: change method getting commit sha

fhraise · Jan 20, 2024 · bd04790 · bd04790
1 parent 7fcd311
commit bd04790
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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}")
     }