Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix version printing on Flank release #952

Merged
merged 2 commits into from
Aug 7, 2020
Merged

Fix version printing on Flank release #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0e65ee
Change param runningOnBitrise to more generic runningOnCI
Aug 7, 2020
20d5a04
Update release_notes.md
Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion release_notes.md
View file
Open in desktop
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
View file
Open in desktop
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