From e0e65ee907b623d5797b8e67b41857a3e6789bf9 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Fri, 7 Aug 2020 12:39:22 +0200 Subject: [PATCH 1/2] Change param runningOnBitrise to more generic runningOnCI --- test_runner/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test_runner/build.gradle.kts b/test_runner/build.gradle.kts index 216ed1236c..94dfc5d621 100644 --- a/test_runner/build.gradle.kts +++ b/test_runner/build.gradle.kts @@ -140,11 +140,11 @@ tasks.jacocoTestReport { } } -val runningOnBitrise get() = System.getenv("BITRISE_IO") != null +val runningOnCI get() = System.getenv("CI") != null tasks.withType().configureEach { // https://devcenter.bitrise.io/builds/available-environment-variables/ - kotlinOptions.allWarningsAsErrors = runningOnBitrise + kotlinOptions.allWarningsAsErrors = runningOnCI } application { @@ -288,7 +288,7 @@ val processCliAsciiDoc by tasks.registering { val updateVersion by tasks.registering { shouldRunAfter(tasks.processResources) - if (!runningOnBitrise) doLast { + if (!runningOnCI) doLast { File("$buildDir/resources/main/version.txt").writeText("local_snapshot") File("$buildDir/resources/main/revision.txt").writeText(execAndGetStdout("git", "rev-parse", "HEAD")) } From 20d5a041ed0bcbb453fc455737d5ea2778503d81 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Fri, 7 Aug 2020 12:53:01 +0200 Subject: [PATCH 2/2] Update release_notes.md --- release_notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release_notes.md b/release_notes.md index 31a3cf1354..938e7a17cf 100644 --- a/release_notes.md +++ b/release_notes.md @@ -1,5 +1,5 @@ ## next (unreleased) -- +- [#952](https://github.com/Flank/flank/pull/952) Fix version printing on Flank release - -