From ec52f99cb0141434ec12321df3a8e0772960a3a7 Mon Sep 17 00:00:00 2001 From: Michael Matranga Date: Mon, 18 Jul 2022 15:45:28 -0400 Subject: [PATCH] Corrected vendor deps. (#797) * Corrected vendor deps. * Corrected outdated calls to CheckOnly. --- cli/run_util.go | 9 +---- go.mod | 14 +------- go.sum | 34 ++----------------- models/models_methods.go | 2 +- .../bitrise-io/stepman/models/models.go | 17 ++++------ .../bitrise-io/stepman/version/version.go | 2 +- vendor/modules.txt | 2 +- 7 files changed, 13 insertions(+), 67 deletions(-) diff --git a/cli/run_util.go b/cli/run_util.go index ab1fad236..f06a283bd 100644 --- a/cli/run_util.go +++ b/cli/run_util.go @@ -344,16 +344,9 @@ func checkAndInstallStepDependencies(step stepmanModels.StepModel) error { log.Warnf("step.dependencies is deprecated... Use step.deps instead.") } - if step.Deps != nil && (len(step.Deps.Brew) > 0 || len(step.Deps.AptGet) > 0 || len(step.Deps.CheckOnly) > 0) { + if step.Deps != nil && (len(step.Deps.Brew) > 0 || len(step.Deps.AptGet) > 0) { // // New dependency handling - for _, checkOnlyDep := range step.Deps.CheckOnly { - if err := bitrise.DependencyTryCheckTool(checkOnlyDep.Name); err != nil { - return err - } - log.Infof(" * "+colorstring.Green("[OK]")+" Step dependency (%s) installed, available.", checkOnlyDep.Name) - } - switch runtime.GOOS { case "darwin": for _, brewDep := range step.Deps.Brew { diff --git a/go.mod b/go.mod index 3dd5cde2c..4f0c6aa45 100644 --- a/go.mod +++ b/go.mod @@ -3,31 +3,19 @@ module github.com/bitrise-io/bitrise go 1.16 require ( - github.com/Masterminds/semver v1.5.0 // indirect - github.com/Masterminds/vcs v1.13.3 // indirect - github.com/armon/go-radix v1.0.0 // indirect github.com/bitrise-io/envman v0.0.0-20220401145857-d11e00a5dc55 github.com/bitrise-io/go-utils v1.0.2 github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.6 github.com/bitrise-io/goinp v0.0.0-20211005113137-305e91b481f4 github.com/bitrise-io/gows v0.0.0-20211005113107-14f65e686b88 - github.com/bitrise-io/stepman v0.0.0-20220107162322-d37bb82e8983 - github.com/boltdb/bolt v1.3.1 // indirect + github.com/bitrise-io/stepman v0.0.0-20220718172049-e5ae0a09c2f2 github.com/gofrs/uuid v4.2.0+incompatible - github.com/golang/dep v0.5.4 // indirect - github.com/golang/protobuf v1.5.2 // indirect github.com/hashicorp/go-version v1.4.0 - github.com/jmank88/nuts v0.4.0 // indirect - github.com/nightlyone/lockfile v1.0.0 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect github.com/ryanuber/go-glob v1.0.0 - github.com/sdboyer/constext v0.0.0-20170321163424-836a14457353 // indirect github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.1 github.com/urfave/cli v1.22.5 golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect - golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a - google.golang.org/protobuf v1.28.0 // indirect gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index c64bdfd1f..d3ab104ee 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,4 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/vcs v1.13.3 h1:IIA2aBdXvfbIM+yl/eTnL4hb1XwdpvuQLglAix1gweE= -github.com/Masterminds/vcs v1.13.3/go.mod h1:TiE7xuEjl1N4j016moRd6vezp6e6Lz23gypeXfzXeW8= -github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/bitrise-io/colorstring v0.0.0-20180614154802-a8cd70115192 h1:vSHYT6kCL/iOT9BVuUPm0tVcbW57r5zldLWg0aB7qbQ= github.com/bitrise-io/colorstring v0.0.0-20180614154802-a8cd70115192/go.mod h1:CIHVcxZUvsG99XUJV6JlR7okNsMMGY81jMvPC20W+O0= github.com/bitrise-io/envman v0.0.0-20211026063720-03283f9c3f32/go.mod h1:L4WQyg88d87Z4dxNwrYEa0Cwd9/W0gSfXsibw30r8Vw= @@ -22,11 +16,8 @@ github.com/bitrise-io/goinp v0.0.0-20211005113137-305e91b481f4 h1:ytUxnO7iSGHlNp github.com/bitrise-io/goinp v0.0.0-20211005113137-305e91b481f4/go.mod h1:iRbd8zAXLeNy+0gic0eqNCxXvDGe8ZEY/uYX2CCeAoo= github.com/bitrise-io/gows v0.0.0-20211005113107-14f65e686b88 h1:HObzyO+BJrTSLqxSUHnik0FS1lOHPmtqXLP0doAsE1g= github.com/bitrise-io/gows v0.0.0-20211005113107-14f65e686b88/go.mod h1:3Cp9ceJ8wHl1Av6oEE2ff1iWaYLliQuD+oaNdyM0NWQ= -github.com/bitrise-io/stepman v0.0.0-20220107162322-d37bb82e8983 h1:R/EuQifs+KrnMpjHupm0jcrMv/BjW/3A2KDD2JEgr5g= -github.com/bitrise-io/stepman v0.0.0-20220107162322-d37bb82e8983/go.mod h1:25vk5IaQiOpXLMcjyJjY6RmZe6JEOqMe8TJoTvKgyuw= -github.com/boltdb/bolt v1.1.0/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/bitrise-io/stepman v0.0.0-20220718172049-e5ae0a09c2f2 h1:JOiFJlKNYKoK6a7d7GaSqOklBvQAogUvqZF8xvmGw90= +github.com/bitrise-io/stepman v0.0.0-20220718172049-e5ae0a09c2f2/go.mod h1:25vk5IaQiOpXLMcjyJjY6RmZe6JEOqMe8TJoTvKgyuw= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -35,12 +26,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/golang/dep v0.5.4 h1:WfV5qbGwsBNUDhk+pfI6emWm7SdDFsnSWkqCMNG3BRs= -github.com/golang/dep v0.5.4/go.mod h1:6RZ2Wai7dSWk7qL55sDYk+8UPFqcW7all2KDBraPPFA= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= @@ -53,15 +38,8 @@ github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER github.com/hashicorp/go-version v1.4.0 h1:aAQzgqIrRKRa7w75CKpbBxYsmUoPjzVm1W59ca1L0J4= github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jmank88/nuts v0.4.0 h1:3rHp+7YcvtkTPohGBA++MwneB9OlX/rpORvleiRivMQ= -github.com/jmank88/nuts v0.4.0/go.mod h1:TKOSbm0p73pdAzgQ7lcZheG2cinZiXqy60KM5ooL3j8= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/nightlyone/lockfile v1.0.0 h1:RHep2cFKK4PonZJDdEl4GmkabuhbsRMgk/k3uAmxBiA= -github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= -github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -70,8 +48,6 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= -github.com/sdboyer/constext v0.0.0-20170321163424-836a14457353 h1:tnWWLf0nI2TI62Wd/ZOea4XYqE+y1sf2pdm+VItsc0c= -github.com/sdboyer/constext v0.0.0-20170321163424-836a14457353/go.mod h1:5HStXbIikwtDAgAIqiQIqVgMn7mlvZa6PTpwiAVYGYg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= @@ -105,8 +81,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 h1:w8s32wxx3sY+OjLlv9qltkLU5yvJzxjjgiHWLjdIcw4= -golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -133,10 +107,6 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200220224806-8a925fa4c0df/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/viktorbenei/cobra.v0 v0.0.0-20160704194906-5513220bc3d9/go.mod h1:ES58JZUprnB7l7btSIgwT2KtWLFz7nleq84TF6wsCjg= diff --git a/models/models_methods.go b/models/models_methods.go index c04ccc1ee..389c31390 100644 --- a/models/models_methods.go +++ b/models/models_methods.go @@ -944,7 +944,7 @@ func MergeStepWith(step, otherStep stepmanModels.StepModel) (stepmanModels.StepM step.Toolkit = new(stepmanModels.StepToolkitModel) *step.Toolkit = *otherStep.Toolkit } - if otherStep.Deps != nil && (len(otherStep.Deps.Brew) > 0 || len(otherStep.Deps.AptGet) > 0 || len(otherStep.Deps.CheckOnly) > 0) { + if otherStep.Deps != nil && (len(otherStep.Deps.Brew) > 0 || len(otherStep.Deps.AptGet) > 0) { step.Deps = otherStep.Deps } if otherStep.IsRequiresAdminUser != nil { diff --git a/vendor/github.com/bitrise-io/stepman/models/models.go b/vendor/github.com/bitrise-io/stepman/models/models.go index fc4c1f9e9..7ab6ea698 100644 --- a/vendor/github.com/bitrise-io/stepman/models/models.go +++ b/vendor/github.com/bitrise-io/stepman/models/models.go @@ -40,16 +40,10 @@ type AptGetDepModel struct { BinName string `json:"bin_name,omitempty" yaml:"bin_name,omitempty"` } -// CheckOnlyDepModel ... -type CheckOnlyDepModel struct { - Name string `json:"name,omitempty" yaml:"name,omitempty"` -} - // DepsModel ... type DepsModel struct { - Brew []BrewDepModel `json:"brew,omitempty" yaml:"brew,omitempty"` - AptGet []AptGetDepModel `json:"apt_get,omitempty" yaml:"apt_get,omitempty"` - CheckOnly []CheckOnlyDepModel `json:"check_only,omitempty" yaml:"check_only,omitempty"` + Brew []BrewDepModel `json:"brew,omitempty" yaml:"brew,omitempty"` + AptGet []AptGetDepModel `json:"apt_get,omitempty" yaml:"apt_get,omitempty"` } // BashStepToolkitModel ... @@ -63,6 +57,7 @@ type GoStepToolkitModel struct { PackageName string `json:"package_name" yaml:"package_name"` } +// SwiftStepToolkitModel ... type SwiftStepToolkitModel struct { BinaryLocation string `json:"binary_location,omitempty" yaml:"binary_location,omitempty"` ExecutableName string `json:"executable_name,omitempty" yaml:"executable_name,omitempty"` @@ -70,9 +65,9 @@ type SwiftStepToolkitModel struct { // StepToolkitModel ... type StepToolkitModel struct { - Bash *BashStepToolkitModel `json:"bash,omitempty" yaml:"bash,omitempty"` - Go *GoStepToolkitModel `json:"go,omitempty" yaml:"go,omitempty"` - Swift *SwiftStepToolkitModel `json:"swift,omitempty" yaml:"swift,omitempty"` + Bash *BashStepToolkitModel `json:"bash,omitempty" yaml:"bash,omitempty"` + Go *GoStepToolkitModel `json:"go,omitempty" yaml:"go,omitempty"` + Swift *SwiftStepToolkitModel `json:"swift,omitempty" yaml:"swift,omitempty"` } // StepModel ... diff --git a/vendor/github.com/bitrise-io/stepman/version/version.go b/vendor/github.com/bitrise-io/stepman/version/version.go index 3b64b0a05..3aa8352c2 100644 --- a/vendor/github.com/bitrise-io/stepman/version/version.go +++ b/vendor/github.com/bitrise-io/stepman/version/version.go @@ -1,4 +1,4 @@ package version // VERSION ... -const VERSION = "0.13.1" +const VERSION = "0.13.2" diff --git a/vendor/modules.txt b/vendor/modules.txt index 0cc5e0d1d..a21adb764 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -38,7 +38,7 @@ github.com/bitrise-io/goinp/goinp # github.com/bitrise-io/gows v0.0.0-20211005113107-14f65e686b88 ## explicit github.com/bitrise-io/gows/gows -# github.com/bitrise-io/stepman v0.0.0-20220107162322-d37bb82e8983 +# github.com/bitrise-io/stepman v0.0.0-20220718172049-e5ae0a09c2f2 ## explicit github.com/bitrise-io/stepman/cli github.com/bitrise-io/stepman/models