diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a472bf360..373f215d37 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,4 +88,4 @@ jobs: run: flankScripts release releaseFlank --input-file=./test_runner/build/libs/flank.jar --git-tag=$RELEASE_TAG --commit-hash=$GIT_SHORT_HASH - name: Sync bintray to maven central - run: flankScripts release jFrogSync --git-tag=$RELEASE_TAG + run: flankScripts release jFrogSync --maven-tag=$MVN_VERSION diff --git a/flank-scripts/src/main/kotlin/flank/scripts/release/jfrog/sync/SyncMaven.kt b/flank-scripts/src/main/kotlin/flank/scripts/release/jfrog/sync/SyncMaven.kt index a884138dec..e26a16b0d1 100644 --- a/flank-scripts/src/main/kotlin/flank/scripts/release/jfrog/sync/SyncMaven.kt +++ b/flank-scripts/src/main/kotlin/flank/scripts/release/jfrog/sync/SyncMaven.kt @@ -9,11 +9,11 @@ import kotlin.system.exitProcess class SyncMavenCommand : CliktCommand(name = "jFrogSync", help = "Sync maven repository using jfrog") { - private val gitTag by option(help = "Git Tag").required() + private val mavenTag by option(help = "Maven Tag").required() override fun run() { - exitProcess(jFrogSync(gitTag)) + exitProcess(jFrogSync(mavenTag)) } } -fun jFrogSync(gitTag: String) = "jfrog bt mcs ${flankMaven(gitTag)}".runCommand(retryCount = 3) +fun jFrogSync(mavenTag: String) = "jfrog bt mcs ${flankMaven(mavenTag)}".runCommand(retryCount = 5) diff --git a/release_notes.md b/release_notes.md index 444960b076..91e9cd61cd 100644 --- a/release_notes.md +++ b/release_notes.md @@ -1,10 +1,11 @@ ## next (unreleased) - [#952](https://github.com/Flank/flank/pull/952) Fix version printing on Flank release - [#950](https://github.com/Flank/flank/pull/950) Fix crash when --legacy-junit-result set. ([adamfilipow92](https://github.com/adamfilipow92)) +- [#948](https://github.com/Flank/flank/pull/948) Increment retry tries and change sync tag for jfrogSync. ([piotradamczyk5](https://github.com/piotradamczyk5)) - - -## v20.8.0 +## v20.08.0 - [#890](https://github.com/Flank/flank/pull/890) Convert bitrise ubuntu workflow into GitHub actions. ([piotradamczyk5](https://github.com/piotradamczyk5)) - [#876](https://github.com/Flank/flank/pull/876) Added option to print Android available devices to test against. ([piotradamczyk5](https://github.com/piotradamczyk5)) - [#895](https://github.com/Flank/flank/pull/895) Added option to print iOS available devices to test against. ([piotradamczyk5](https://github.com/piotradamczyk5)) @@ -25,8 +26,6 @@ - [#926](https://github.com/Flank/flank/pull/926) Flank should reflect gcloud exit codes. ([adamfilipow92](https://github.com/adamfilipow92)) - [#917](https://github.com/Flank/flank/pull/917) Fix an incorrect outcome. ([pawelpasterz](https://github.com/pawelpasterz)) - [#939](https://github.com/Flank/flank/pull/939) Run *list commands when flank.yml not found should display right output. ([adamfilipow92](https://github.com/adamfilipow92)) -- -- ## v20.07.0 - [#857](https://github.com/Flank/flank/pull/857) Added multimodule setup for test app. ([piotradamczyk5](https://github.com/piotradamczyk5))