diff --git a/flank-scripts/src/main/kotlin/flank/scripts/release/hub/ReleaseFlank.kt b/flank-scripts/src/main/kotlin/flank/scripts/release/hub/ReleaseFlank.kt index 95c9a7d511..84bc5fb702 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/release/hub/ReleaseFlank.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/release/hub/ReleaseFlank.kt @@ -15,10 +15,23 @@ fun releaseFlank(path: Path, gitTag: String, commitHash: String, isSnapshotRelea } private fun hubStableReleaseCommand(path: String, gitTag: String, commitHash: String) = - "hub release create -a $path -m \'Flank $gitTag\' -m \'Stable release for commit $commitHash\' $gitTag" + listOf( + "hub", "release", "create", + "-a", path, + "-m", "Flank $gitTag", + "-m", "Stable release for commit $commitHash", + gitTag + ) private fun hubStableSnapshotCommand(path: String, gitTag: String, commitHash: String) = - "hub release create -p -a $path -m \'Flank $gitTag\' -m \'Snapshot release for commit $commitHash\' $gitTag" + listOf( + "hub", "release", "create", + "-p", + "-a", path, + "-m", "Flank $gitTag", + "-m", "Snapshot release for commit $commitHash", + gitTag + ) private fun moveFlankToReleaseDirectory(inputPath: Path) = if (inputPath.toFile().renameTo(File(RELEASE_DIRECTORY))) RELEASE_DIRECTORY else inputPath.toAbsolutePath().toString() diff --git a/flank-scripts/src/main/kotlin/flank/scripts/utils/ShellExecute.kt b/flank-scripts/src/main/kotlin/flank/scripts/utils/ShellExecute.kt index 2efb93e64d..8422266847 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/utils/ShellExecute.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/utils/ShellExecute.kt @@ -1,11 +1,13 @@ package flank.scripts.utils -fun String.runCommand(retryCount: Int = 0) = - ProcessBuilder(*split(" ").toTypedArray()) +fun List.runCommand(retryCount: Int = 0) = + ProcessBuilder(this) .redirectOutput(ProcessBuilder.Redirect.INHERIT) .redirectError(ProcessBuilder.Redirect.INHERIT) .startWithRetry(retryCount) +fun String.runCommand(retryCount: Int = 0) = split(" ").toList().runCommand(retryCount) + private fun ProcessBuilder.startWithRetry(retryCount: Int): Int { var retryTries = 0 var processResponse: Int diff --git a/release_notes.md b/release_notes.md index 72b241b1e7..5e0159c0ec 100644 --- a/release_notes.md +++ b/release_notes.md @@ -15,6 +15,7 @@ - [#910](https://github.com/Flank/flank/pull/910) Migrate Bitrise release workflow into GitHub actions. ([piotradamczyk5](https://github.com/piotradamczyk5)) - [#915](https://github.com/Flank/flank/pull/915) Update virtual devices sharding limit. ([adamfilipow92](https://github.com/adamfilipow92)) - [#920](https://github.com/Flank/flank/pull/920) Improve .yml validation on `doctor` command. ([piotradamczyk5](https://github.com/piotradamczyk5)) +- [#934](https://github.com/Flank/flank/pull/934) Delete incorrect flank snapshot labels. ([piotradamczyk5](https://github.com/piotradamczyk5)) - -