Updated bitrise init dep (#62)

bitrise-io · Feb 16, 2022 · df95d8a · df95d8a
1 parent 3d20568
commit df95d8a
Show file tree

Hide file tree

Showing 32 changed files with 1,342 additions and 1,550 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -101,7 +101,7 @@ func executePhases(cmd cobra.Command) (phases.Progress, error) {
 	}
 
 	// bitrise.yml
-	bitriseYML, primaryWorkflow, branch, err := phases.BitriseYML(currentDir)
+	bitriseYML, primaryWorkflow, branch, err := phases.BitriseYML(currentDir, progress.RegisterSSHKey)
 	if err != nil {
 		return phases.Progress{}, err
 	}

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/Microsoft/go-winio v0.5.0 // indirect
 	github.com/bitrise-io/bitrise v0.0.0-20210623145422-513e39485248
-	github.com/bitrise-io/bitrise-init v0.0.0-20211201163403-80ed402ddf62
+	github.com/bitrise-io/bitrise-init v0.0.0-20220216103435-ee05a81e7191
 	github.com/bitrise-io/codesigndoc v0.0.0-20210521081848-80756d2c5664
 	github.com/bitrise-io/envman v0.0.0-20210630102032-df85af51bd1a
 	github.com/bitrise-io/go-steputils v0.0.0-20210527075147-910ce7a105a1 // indirect

diff --git a/go.sum b/go.sum
@@ -64,8 +64,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-20210520122036-d213de321eb8/go.mod h1:I9KSWJm177/IOBMQHzn6BLgymVLQ0xlv/gMwDCYkWYU=
-github.com/bitrise-io/bitrise-init v0.0.0-20211201163403-80ed402ddf62 h1:+odtVYBzY6JfxkF6qLmq9SjW1A3X1fFN1CKkZoQwSME=
-github.com/bitrise-io/bitrise-init v0.0.0-20211201163403-80ed402ddf62/go.mod h1:I9KSWJm177/IOBMQHzn6BLgymVLQ0xlv/gMwDCYkWYU=
+github.com/bitrise-io/bitrise-init v0.0.0-20220216103435-ee05a81e7191 h1:JORLDNlDVoneF//I31krPFBPZzcl2+Q6x8bWGrzXMjI=
+github.com/bitrise-io/bitrise-init v0.0.0-20220216103435-ee05a81e7191/go.mod h1:I9KSWJm177/IOBMQHzn6BLgymVLQ0xlv/gMwDCYkWYU=
 github.com/bitrise-io/codesigndoc v0.0.0-20210521081848-80756d2c5664 h1:4zk2SY5iKjAqgKmIcAxkAftjrw7pfdoXFSh64pDz5Hw=
 github.com/bitrise-io/codesigndoc v0.0.0-20210521081848-80756d2c5664/go.mod h1:Eql38Q+rFrTpKe/+E6m1Ecx2NsmPYjbuq6eWcGed6CY=
 github.com/bitrise-io/colorstring v0.0.0-20180614154802-a8cd70115192/go.mod h1:CIHVcxZUvsG99XUJV6JlR7okNsMMGY81jMvPC20W+O0=

diff --git a/phases/bitrise_yml.go b/phases/bitrise_yml.go
@@ -231,7 +231,7 @@ func selectWorkflow(buildBitriseYML models.BitriseDataModel, inputReader io.Read
 	return workflow, nil
 }
 
-func getBitriseYML(searchDir string, inputReader io.Reader) (models.BitriseDataModel, string, error) {
+func getBitriseYML(searchDir string, inputReader io.Reader, isPrivateRepo bool) (models.BitriseDataModel, string, error) {
 	potentialBitriseYMLFilePath := filepath.Join(searchDir, bitriseYMLName)
 	if exist, err := pathutil.IsPathExists(potentialBitriseYMLFilePath); err != nil {
 		return models.BitriseDataModel{}, "", fmt.Errorf("failed to check if file (%s) exists, error: %s", potentialBitriseYMLFilePath, err)
@@ -289,7 +289,7 @@ func getBitriseYML(searchDir string, inputReader io.Reader) (models.BitriseDataM
 
 	fmt.Println()
 
-	scanResult, found := scanner.GenerateScanResult(searchDir)
+	scanResult, found := scanner.GenerateScanResult(searchDir, isPrivateRepo)
 	if !found {
 		log.Infof("Projects not found in repository. Select manual configuration.")
 		scanResult, err = scanner.ManualConfig()
@@ -311,10 +311,10 @@ func getBitriseYML(searchDir string, inputReader io.Reader) (models.BitriseDataM
 }
 
 // BitriseYML ...
-func BitriseYML(searchDir string) (models.BitriseDataModel, string, string, error) {
+func BitriseYML(searchDir string, isPrivateRepo bool) (models.BitriseDataModel, string, string, error) {
 	fmt.Println()
 	log.Infof("SETUP BITRISE.YML")
-	bitriseYML, branch, err := getBitriseYML(searchDir, os.Stdin)
+	bitriseYML, branch, err := getBitriseYML(searchDir, os.Stdin, isPrivateRepo)
 	if err != nil {
 		return models.BitriseDataModel{}, "", "", err
 	}

diff --git a/vendor/github.com/bitrise-io/bitrise-init/models/configbuilder.go b/vendor/github.com/bitrise-io/bitrise-init/models/configbuilder.go
diff --git a/vendor/github.com/bitrise-io/bitrise-init/scanner/config.go b/vendor/github.com/bitrise-io/bitrise-init/scanner/config.go
diff --git a/vendor/github.com/bitrise-io/bitrise-init/scanner/errors.go b/vendor/github.com/bitrise-io/bitrise-init/scanner/errors.go
diff --git a/vendor/github.com/bitrise-io/bitrise-init/scanner/result.go b/vendor/github.com/bitrise-io/bitrise-init/scanner/result.go
diff --git a/vendor/github.com/bitrise-io/bitrise-init/scanners/android/android.go b/vendor/github.com/bitrise-io/bitrise-init/scanners/android/android.go