Skip to content

Commit

Permalink
Fix version printing on Flank release (#952)
Browse files Browse the repository at this point in the history
* Change param runningOnBitrise to more generic runningOnCI

* Update release_notes.md

Co-authored-by: Michael Wright <michael.wright@gogoapps.io>
  • Loading branch information
Sloox and Michael Wright authored Aug 7, 2020
1 parent e1637b7 commit 8566004
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion release_notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## next (unreleased)
-
- [#952](https://github.com/Flank/flank/pull/952) Fix version printing on Flank release
-
-

Expand Down
6 changes: 3 additions & 3 deletions test_runner/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ tasks.jacocoTestReport {
}
}

val runningOnBitrise get() = System.getenv("BITRISE_IO") != null
val runningOnCI get() = System.getenv("CI") != null

tasks.withType<KotlinCompile>().configureEach {
// https://devcenter.bitrise.io/builds/available-environment-variables/
kotlinOptions.allWarningsAsErrors = runningOnBitrise
kotlinOptions.allWarningsAsErrors = runningOnCI
}

application {
Expand Down Expand Up @@ -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"))
}
Expand Down

0 comments on commit 8566004

Please sign in to comment.