From 297ced7a2a6ddd186d6ed7514ca2a7966c2aded3 Mon Sep 17 00:00:00 2001 From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com> Date: Sun, 25 May 2025 13:48:08 -0700 Subject: [PATCH] fix(build): allow detached git HEAD --- .github/workflows/build.yml | 3 +-- app/build.gradle.kts | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d344ee..fea646e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,5 +29,4 @@ jobs: with: name: app if-no-files-found: error - path: | - app/build/outputs/apk/debug/app-debug.apk + path: app/build/outputs/apk/debug/app-debug.apk diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6c9fd62..74e1abf 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,9 +8,9 @@ plugins { alias(libs.plugins.kotlin.serialization) } -val gitCurrentBranch = providers.execIgnoreCode("git", "symbolic-ref", "--short", "HEAD") +val gitCurrentBranch = providers.execIgnoreCode("git", "symbolic-ref", "--quiet", "--short", "HEAD").takeIf { it.isNotEmpty() } val gitLatestCommit = providers.execIgnoreCode("git", "rev-parse", "--short", "HEAD") -val gitHasLocalCommits = providers.execIgnoreCode("git", "log", "origin/$gitCurrentBranch..HEAD").isNotEmpty() +val gitHasLocalCommits = gitCurrentBranch?.let { providers.execIgnoreCode("git", "log", "origin/$gitCurrentBranch..HEAD").isNotEmpty() } ?: false val gitHasHasLocalChanges = providers.execIgnoreCode("git", "status", "-s").isNotEmpty() android {