diff --git a/go.mod b/go.mod index 2e5bceb1..5f3cdc94 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/bitrise-io/bitrise v0.0.0-20210623145422-513e39485248 // indirect - github.com/bitrise-io/bitrise-init v0.0.0-20220125141216-6682bda67ae6 + github.com/bitrise-io/bitrise-init v0.0.0-20220126155137-d72696271c25 github.com/bitrise-io/envman v0.0.0-20210630102032-df85af51bd1a // indirect github.com/bitrise-io/go-steputils v0.0.0-20210527075147-910ce7a105a1 github.com/bitrise-io/go-utils v0.0.0-20210713111255-08be784d45d0 diff --git a/go.sum b/go.sum index e2294e27..2491428c 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/bitrise-io/bitrise v0.0.0-20210519130014-380842fb41c1/go.mod h1:Jqf2P github.com/bitrise-io/bitrise v0.0.0-20210623145422-513e39485248 h1:GfhBF379/Uwu4fmalhwwoJv3RcqlrlEo8+gGEcuXLsw= github.com/bitrise-io/bitrise v0.0.0-20210623145422-513e39485248/go.mod h1:jqk9VdrvlRpRfIqA2DZHVNEMvPycmlpBfpiKxk89R6w= github.com/bitrise-io/bitrise-init v0.0.0-20210518121553-1e678625c45d/go.mod h1:2bxvLp7xgXC3HsacG2Z5nn6WOjk8kbNOmLWjinnhnKg= -github.com/bitrise-io/bitrise-init v0.0.0-20220125141216-6682bda67ae6 h1:S4p3zAStpUrqHqk+Rvkx0Ms56OYj5F3ei1PucXCRooM= -github.com/bitrise-io/bitrise-init v0.0.0-20220125141216-6682bda67ae6/go.mod h1:I9KSWJm177/IOBMQHzn6BLgymVLQ0xlv/gMwDCYkWYU= +github.com/bitrise-io/bitrise-init v0.0.0-20220126155137-d72696271c25 h1:PMFyHhRAAsR9oKNNLYlbLpGyCc6tlzz0262v3LK/yDI= +github.com/bitrise-io/bitrise-init v0.0.0-20220126155137-d72696271c25/go.mod h1:I9KSWJm177/IOBMQHzn6BLgymVLQ0xlv/gMwDCYkWYU= github.com/bitrise-io/colorstring v0.0.0-20180614154802-a8cd70115192/go.mod h1:CIHVcxZUvsG99XUJV6JlR7okNsMMGY81jMvPC20W+O0= github.com/bitrise-io/envman v0.0.0-20200512105748-919e33f391ee/go.mod h1:m8pTp1o3Sw9uzDxb1WRm5IBRnMau2iOvPMSnRCAhQNI= github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5/go.mod h1:m8pTp1o3Sw9uzDxb1WRm5IBRnMau2iOvPMSnRCAhQNI= diff --git a/vendor/github.com/bitrise-io/bitrise-init/scanners/android/const.go b/vendor/github.com/bitrise-io/bitrise-init/scanners/android/const.go index 30972483..0cc8df5e 100644 --- a/vendor/github.com/bitrise-io/bitrise-init/scanners/android/const.go +++ b/vendor/github.com/bitrise-io/bitrise-init/scanners/android/const.go @@ -1,8 +1,16 @@ package android -const deployWorkflowDescription = `Deploys app using [Deploy to bitrise.io Step](https://devcenter.bitrise.io/en/getting-started/getting-started-with-android-apps.html#deploying-an-android-app-to-bitrise-io-53056). +const ( + primaryWorkflowDescription = `Runs tests. + +Next steps: +- Check out [Getting started with Android apps](https://devcenter.bitrise.io/en/getting-started/getting-started-with-android-apps.html). +` + + deployWorkflowDescription = `Deploys app using [Deploy to bitrise.io Step](https://devcenter.bitrise.io/en/getting-started/getting-started-with-android-apps.html#deploying-an-android-app-to-bitrise-io-53056). Next steps: - Check out [Getting started with Android apps](https://devcenter.bitrise.io/en/getting-started/getting-started-with-android-apps.html) for signing and deployment options. - [Set up code signing with *Android Sign* Step](https://devcenter.bitrise.io/en/code-signing/android-code-signing/android-code-signing-using-the-android-sign-step.html). ` +) diff --git a/vendor/github.com/bitrise-io/bitrise-init/scanners/android/utility.go b/vendor/github.com/bitrise-io/bitrise-init/scanners/android/utility.go index 3354a4a6..9bed1bfe 100644 --- a/vendor/github.com/bitrise-io/bitrise-init/scanners/android/utility.go +++ b/vendor/github.com/bitrise-io/bitrise-init/scanners/android/utility.go @@ -137,18 +137,13 @@ func (scanner *Scanner) generateConfigBuilder(isPrivateRepository bool) models.C projectLocationEnv, gradlewPath, moduleEnv, variantEnv := "$"+ProjectLocationInputEnvKey, "$"+ProjectLocationInputEnvKey+"/gradlew", "$"+ModuleInputEnvKey, "$"+VariantInputEnvKey //-- primary - configBuilder.AppendStepListItemsTo(models.PrimaryWorkflowID, steps.DefaultPrepareStepList(true)...) + configBuilder.AppendStepListItemsTo(models.PrimaryWorkflowID, steps.DefaultPrepareStepListV2(steps.PrepareListParams{ + ShouldIncludeCache: true, + ShouldIncludeActivateSSH: isPrivateRepository, + })...) configBuilder.AppendStepListItemsTo(models.PrimaryWorkflowID, steps.InstallMissingAndroidToolsStepListItem( envmanModels.EnvironmentItemModel{GradlewPathInputKey: gradlewPath}, )) - configBuilder.AppendStepListItemsTo(models.PrimaryWorkflowID, steps.AndroidLintStepListItem( - envmanModels.EnvironmentItemModel{ - ProjectLocationInputKey: projectLocationEnv, - }, - envmanModels.EnvironmentItemModel{ - VariantInputKey: variantEnv, - }, - )) configBuilder.AppendStepListItemsTo(models.PrimaryWorkflowID, steps.AndroidUnitTestStepListItem( envmanModels.EnvironmentItemModel{ ProjectLocationInputKey: projectLocationEnv, @@ -157,7 +152,8 @@ func (scanner *Scanner) generateConfigBuilder(isPrivateRepository bool) models.C VariantInputKey: variantEnv, }, )) - configBuilder.AppendStepListItemsTo(models.PrimaryWorkflowID, steps.DefaultDeployStepList(true)...) + configBuilder.AppendStepListItemsTo(models.PrimaryWorkflowID, steps.DefaultDeployStepListV2(true)...) + configBuilder.SetWorkflowDescriptionTo(models.PrimaryWorkflowID, primaryWorkflowDescription) //-- deploy configBuilder.AppendStepListItemsTo(models.DeployWorkflowID, steps.DefaultPrepareStepListV2(steps.PrepareListParams{ diff --git a/vendor/modules.txt b/vendor/modules.txt index 896f73f5..36712628 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -3,7 +3,7 @@ github.com/beevik/etree # github.com/bitrise-io/bitrise v0.0.0-20210623145422-513e39485248 ## explicit github.com/bitrise-io/bitrise/models -# github.com/bitrise-io/bitrise-init v0.0.0-20220125141216-6682bda67ae6 +# github.com/bitrise-io/bitrise-init v0.0.0-20220126155137-d72696271c25 ## explicit github.com/bitrise-io/bitrise-init/analytics github.com/bitrise-io/bitrise-init/errormapper