From a50bd67b1becb15ff86426d18d67ffb323e0b59c Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Wed, 20 Aug 2025 11:24:21 -0700 Subject: [PATCH 1/4] Try to read git hash from env for dev build --- build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 2dcf47a2d..a98aacc6f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,6 +58,12 @@ if (project.hasProperty("release")) { val nextMajorVersion = majorVersion + 1 val datestamp = DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDate.now()) flutterPluginVersion = "$nextMajorVersion.0.0-dev.$datestamp" + + val commitHash = System.getenv("KOKORO_GITHUB_COMMIT") + if (commitHash is String) { + val shortCommitHash = commitHash.take(7) + flutterPluginVersion += "-$shortCommitHash" + } } val ideaVersion = providers.gradleProperty("ideaVersion").get() From 71032b8362cc8371ae6c550a405ffc2b62488ad4 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Tue, 2 Sep 2025 10:59:03 -0700 Subject: [PATCH 2/4] Print out env vars --- build.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index a98aacc6f..f5f4d9670 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,6 +59,13 @@ if (project.hasProperty("release")) { val datestamp = DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDate.now()) flutterPluginVersion = "$nextMajorVersion.0.0-dev.$datestamp" + println("--- Environment Variables ---") + // Sort by key for cleaner, predictable output + System.getenv().entries.sortedBy { it.key }.forEach { (key, value) -> + println("$key: $value") + } + println("---------------------------") + val commitHash = System.getenv("KOKORO_GITHUB_COMMIT") if (commitHash is String) { val shortCommitHash = commitHash.take(7) From 778a28ffb89253435590331a059285e9d6c32af5 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Tue, 2 Sep 2025 11:38:43 -0700 Subject: [PATCH 3/4] Change env var name --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f5f4d9670..4a4492711 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -66,7 +66,7 @@ if (project.hasProperty("release")) { } println("---------------------------") - val commitHash = System.getenv("KOKORO_GITHUB_COMMIT") + val commitHash = System.getenv("KOKORO_GIT_COMMIT") if (commitHash is String) { val shortCommitHash = commitHash.take(7) flutterPluginVersion += "-$shortCommitHash" From 2082ea61b953d235bc74f1084c97b3a16e9689c1 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Tue, 2 Sep 2025 12:25:44 -0700 Subject: [PATCH 4/4] Remove print --- build.gradle.kts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4a4492711..c3f8f7b2c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,13 +59,6 @@ if (project.hasProperty("release")) { val datestamp = DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDate.now()) flutterPluginVersion = "$nextMajorVersion.0.0-dev.$datestamp" - println("--- Environment Variables ---") - // Sort by key for cleaner, predictable output - System.getenv().entries.sortedBy { it.key }.forEach { (key, value) -> - println("$key: $value") - } - println("---------------------------") - val commitHash = System.getenv("KOKORO_GIT_COMMIT") if (commitHash is String) { val shortCommitHash = commitHash.take(7)