diff --git a/cache.go b/cache.go index 663fb26..d6ff0dc 100644 --- a/cache.go +++ b/cache.go @@ -6,7 +6,6 @@ import ( "strings" "github.com/bitrise-io/bitrise-init/scanners/android" - "github.com/bitrise-io/bitrise-init/utility" androidCache "github.com/bitrise-io/go-android/cache" "github.com/bitrise-io/go-steputils/cache" "github.com/bitrise-io/go-utils/log" @@ -22,12 +21,12 @@ var depsFuncs = []depsFunc{ } func iosDeps(dir string, buildDirName, lockFileName string) ([]string, []string, error) { - files, err := utility.ListPathInDirSortedByComponents(dir, false) + files, err := pathutil.ListPathInDirSortedByComponents(dir, false) if err != nil { return nil, nil, fmt.Errorf("failed to search for files in (%s), error: %s", dir, err) } - locks, err := utility.FilterPaths(files, utility.BaseFilter(lockFileName, true)) + locks, err := pathutil.FilterPaths(files, pathutil.BaseFilter(lockFileName, true)) if err != nil { return nil, nil, err } diff --git a/go.mod b/go.mod index 5014e1d..933a3e1 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,10 @@ module github.com/bitrise-io/steps-fastlane go 1.12 require ( - github.com/bitrise-io/bitrise v0.0.0-20210513161711-09b1442cf3e0 // indirect - github.com/bitrise-io/bitrise-init v0.0.0-20210512085703-71cb279cf605 + github.com/bitrise-io/bitrise-init v0.0.0-20210518124036-0b2b7f91bdb1 github.com/bitrise-io/go-android v0.0.0-20210517091621-72f0eb7a5197 github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77 - github.com/bitrise-io/go-utils v0.0.0-20210514133945-9dd14e1c514a - github.com/bitrise-io/go-xcode v0.0.0-20210512084902-047d3c3d372a + github.com/bitrise-io/go-utils v0.0.0-20210517140706-aa64fd88ca49 + github.com/bitrise-io/go-xcode v0.0.0-20210517092111-792daa927657 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 ) diff --git a/go.sum b/go.sum index 510a68f..8140624 100644 --- a/go.sum +++ b/go.sum @@ -1,37 +1,36 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= -github.com/bitrise-io/bitrise v0.0.0-20210401073821-4ed3f06d26ae/go.mod h1:+8ruIdZ7mWWfrd/Of38jmN50x6Y80H7SMmwf78HhBno= github.com/bitrise-io/bitrise v0.0.0-20210513161711-09b1442cf3e0 h1:Ym7cBQs7pqKEEp5eD/snnXKQse6sQr4ouijrHjpaU2Q= github.com/bitrise-io/bitrise v0.0.0-20210513161711-09b1442cf3e0/go.mod h1:Jqf2PLwOKL1bYdbQIhVkNd55YyYKJBXyY0EtlRg5uw4= -github.com/bitrise-io/bitrise-init v0.0.0-20210512085703-71cb279cf605 h1:1KSTYW2ElGDucFXX2bEyZlVLCt7KiBdqzYwvvbrhDt0= -github.com/bitrise-io/bitrise-init v0.0.0-20210512085703-71cb279cf605/go.mod h1:OOimAjkSKnpOxj+6UzvidjNfjUm0Wd5cWT4zxWP0jKQ= +github.com/bitrise-io/bitrise-init v0.0.0-20210518124036-0b2b7f91bdb1 h1:ujVxB2VA3xd0LgUkNucFhDg0moxAojx3KVY45hzbCoE= +github.com/bitrise-io/bitrise-init v0.0.0-20210518124036-0b2b7f91bdb1/go.mod h1:2bxvLp7xgXC3HsacG2Z5nn6WOjk8kbNOmLWjinnhnKg= 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 h1:zZiMNcVl2WhYxEZ6VWL1J8Xc1uAk7WE5sTh7+yMs2qM= github.com/bitrise-io/envman v0.0.0-20200512105748-919e33f391ee/go.mod h1:m8pTp1o3Sw9uzDxb1WRm5IBRnMau2iOvPMSnRCAhQNI= +github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5 h1:3jVXjsejV+1EW9Sp7ef+sMinD0J3HFsPgh4Du6ctqZc= +github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5/go.mod h1:m8pTp1o3Sw9uzDxb1WRm5IBRnMau2iOvPMSnRCAhQNI= github.com/bitrise-io/go-android v0.0.0-20210517091621-72f0eb7a5197 h1:rdMOrZ6f5T8evFF8o+lBj9p5dPiwm+t7yCwHBGD3qZI= github.com/bitrise-io/go-android v0.0.0-20210517091621-72f0eb7a5197/go.mod h1:vcNcrAM6B5gDdgDZ9n51FTLT/kTHmiWatjCkJcstCNY= github.com/bitrise-io/go-plist v0.0.0-20210301100253-4b1a112ccd10/go.mod h1:pARutiL3kEuRLV3JvswidvfCj+9Y3qMZtji2BDqLFsA= -github.com/bitrise-io/go-steputils v0.0.0-20210505101226-8536c460c5c1/go.mod h1:gF9UfXaXyxkKLAKgo+RpZFsRemnTv6wAPTljpJXoxI8= github.com/bitrise-io/go-steputils v0.0.0-20210507072936-92fde382fb33/go.mod h1:YCtb1VETn/rF9tCt9oInhd/cwbt1ETPm+dTlDIfyD+A= github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77 h1:+wd+ADdtJCRL9JEghE1RMbR4ywXBYNvIBelAW/UkWr8= github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77/go.mod h1:H0iZjgsAR5NA6pnlD/zKB6AbxEsskq55pwJ9klVmP8w= github.com/bitrise-io/go-utils v0.0.0-20201019131314-6cc2aa4d248a/go.mod h1:tTEsKvbz1LbzuN/KpVFHXnLtcAPdEgIdM41s0lL407s= -github.com/bitrise-io/go-utils v0.0.0-20210323091856-00429d8e1e87/go.mod h1:tTEsKvbz1LbzuN/KpVFHXnLtcAPdEgIdM41s0lL407s= github.com/bitrise-io/go-utils v0.0.0-20210505091801-98b7dc39ee61/go.mod h1:nhdaDQFvaMny1CugVV6KjK92/q97ENo0RuKSW5I4fbA= github.com/bitrise-io/go-utils v0.0.0-20210505121718-07411d72e36e/go.mod h1:nhdaDQFvaMny1CugVV6KjK92/q97ENo0RuKSW5I4fbA= github.com/bitrise-io/go-utils v0.0.0-20210506064210-b22e2b7b3ad3/go.mod h1:nhdaDQFvaMny1CugVV6KjK92/q97ENo0RuKSW5I4fbA= github.com/bitrise-io/go-utils v0.0.0-20210507100250-37de47dfa6ce/go.mod h1:15EZZf02noI5nWFqXMZEoyb1CyqYRXTMz5Fyu4CWFzI= -github.com/bitrise-io/go-utils v0.0.0-20210514133945-9dd14e1c514a h1:x3Ygb0rbEp6ECU7JyQFn0kF6yqfvBDizDMLmZ7DZofA= -github.com/bitrise-io/go-utils v0.0.0-20210514133945-9dd14e1c514a/go.mod h1:DRx7oFuAqk0dbKpAKCqWl0TgrowfJUb/MqYPRscxJOQ= -github.com/bitrise-io/go-xcode v0.0.0-20210507081243-7cf47826c379/go.mod h1:Uf8cyzwr2RkrSMGonihVOOxMoQoR8UI7XeqHOGJTekI= -github.com/bitrise-io/go-xcode v0.0.0-20210512084902-047d3c3d372a h1:4XaNh674hGnNY0izax4b9VAdCfrO0m1v4YvHP2Z7xTI= -github.com/bitrise-io/go-xcode v0.0.0-20210512084902-047d3c3d372a/go.mod h1:e03FCUQftAwBAdcxVJ4/sn59M50AXqujkX/lJr/Ldak= +github.com/bitrise-io/go-utils v0.0.0-20210514083430-4d1fb0330dfe/go.mod h1:DRx7oFuAqk0dbKpAKCqWl0TgrowfJUb/MqYPRscxJOQ= +github.com/bitrise-io/go-utils v0.0.0-20210517140706-aa64fd88ca49 h1:du0kI1TU7cv/Hr8U3plyAlMtyOf2kUj4CA4ku5bz20Y= +github.com/bitrise-io/go-utils v0.0.0-20210517140706-aa64fd88ca49/go.mod h1:DRx7oFuAqk0dbKpAKCqWl0TgrowfJUb/MqYPRscxJOQ= +github.com/bitrise-io/go-xcode v0.0.0-20210517092111-792daa927657 h1:p2R7vSBv9QqXcAdQXfiUJxatY7zQ7NZnrrfRYqO56ts= +github.com/bitrise-io/go-xcode v0.0.0-20210517092111-792daa927657/go.mod h1:OexOTlMlXuf88bsFsaw5KxmIYrYDsHkTh01vbhGNpus= github.com/bitrise-io/goinp v0.0.0-20210504152833-8559b0680ab1/go.mod h1:iRbd8zAXLeNy+0gic0eqNCxXvDGe8ZEY/uYX2CCeAoo= github.com/bitrise-io/gows v0.0.0-20210505125306-dd92ff463938/go.mod h1:3Cp9ceJ8wHl1Av6oEE2ff1iWaYLliQuD+oaNdyM0NWQ= github.com/bitrise-io/pkcs12 v0.0.0-20210430063833-0da06eb56630/go.mod h1:UiXKNs0essbC14a2TvGlnUKo9isP9m4guPrp8KJHJpU= -github.com/bitrise-io/stepman v0.0.0-20210505110307-5c2296bcc558 h1:KXVbqpnMwLqQpAA8HkUVof+CZnFIELJZIzEwBkJ6OYk= github.com/bitrise-io/stepman v0.0.0-20210505110307-5c2296bcc558/go.mod h1:WLh58JYBgbD1Z/yyw1AkFz/90F6oBL0HS/luBpUW9dI= +github.com/bitrise-io/stepman v0.0.0-20210517135458-203f7a48d37a h1:qsEFYqhVeo0mLrdl7nLTNbCz0AZ+8nOxQD+LPFw2Oq4= +github.com/bitrise-io/stepman v0.0.0-20210517135458-203f7a48d37a/go.mod h1:WLh58JYBgbD1Z/yyw1AkFz/90F6oBL0HS/luBpUW9dI= github.com/bitrise-io/xcode-project v0.0.0-20201203153351-7ad13a1dd021/go.mod h1:R2iDrjJlNQtVwIdXT+F9bcx/YTNJPdd0tXfFRJsxHaM= github.com/bitrise-io/xcode-project v0.0.0-20210302080829-f3e0bfbcd5cb/go.mod h1:t9Gj5Pe/FBDTUrkFmw2lK6PbzESB6o27eE97ukZj8Rs= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -86,7 +85,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= @@ -100,8 +98,8 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210507161434-a76c4d0a0096/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/vendor/github.com/bitrise-io/bitrise-init/models/models.go b/vendor/github.com/bitrise-io/bitrise-init/models/models.go index f6ca639..f65f2e6 100644 --- a/vendor/github.com/bitrise-io/bitrise-init/models/models.go +++ b/vendor/github.com/bitrise-io/bitrise-init/models/models.go @@ -1,7 +1,7 @@ package models import ( - "github.com/bitrise-io/bitrise-init/step" + "github.com/bitrise-io/go-steputils/step" ) // BitriseConfigMap ... diff --git a/vendor/github.com/bitrise-io/bitrise-init/steps/const.go b/vendor/github.com/bitrise-io/bitrise-init/steps/const.go index 592eb91..01f52c9 100644 --- a/vendor/github.com/bitrise-io/bitrise-init/steps/const.go +++ b/vendor/github.com/bitrise-io/bitrise-init/steps/const.go @@ -32,7 +32,7 @@ const ( // GitCloneID ... GitCloneID = "git-clone" // GitCloneVersion ... - GitCloneVersion = "5" + GitCloneVersion = "6" ) const ( diff --git a/vendor/github.com/bitrise-io/bitrise-init/utility/sortable_path.go b/vendor/github.com/bitrise-io/bitrise-init/utility/sortable_path.go deleted file mode 100644 index dac6ef0..0000000 --- a/vendor/github.com/bitrise-io/bitrise-init/utility/sortable_path.go +++ /dev/null @@ -1,90 +0,0 @@ -package utility - -import ( - "os" - "path/filepath" - "sort" - "strings" - - "github.com/bitrise-io/go-utils/pathutil" -) - -// SortablePath ... -type SortablePath struct { - Pth string - AbsPth string - Components []string -} - -// NewSortablePath ... -func NewSortablePath(pth string) (SortablePath, error) { - absPth, err := pathutil.AbsPath(pth) - if err != nil { - return SortablePath{}, err - } - - components := strings.Split(absPth, string(os.PathSeparator)) - fixedComponents := []string{} - for _, comp := range components { - if comp != "" { - fixedComponents = append(fixedComponents, comp) - } - } - - return SortablePath{ - Pth: pth, - AbsPth: absPth, - Components: fixedComponents, - }, nil -} - -// BySortablePathComponents .. -type BySortablePathComponents []SortablePath - -func (s BySortablePathComponents) Len() int { - return len(s) -} -func (s BySortablePathComponents) Swap(i, j int) { - s[i], s[j] = s[j], s[i] -} -func (s BySortablePathComponents) Less(i, j int) bool { - path1 := s[i] - path2 := s[j] - - d1 := len(path1.Components) - d2 := len(path2.Components) - - if d1 < d2 { - return true - } else if d1 > d2 { - return false - } - - // if same component size, - // do alphabetic sort based on the last component - base1 := filepath.Base(path1.AbsPth) - base2 := filepath.Base(path2.AbsPth) - - return base1 < base2 -} - -// SortPathsByComponents ... -func SortPathsByComponents(paths []string) ([]string, error) { - sortableFiles := []SortablePath{} - for _, pth := range paths { - sortable, err := NewSortablePath(pth) - if err != nil { - return []string{}, err - } - sortableFiles = append(sortableFiles, sortable) - } - - sort.Sort(BySortablePathComponents(sortableFiles)) - - sortedFiles := []string{} - for _, pth := range sortableFiles { - sortedFiles = append(sortedFiles, pth.Pth) - } - - return sortedFiles, nil -} diff --git a/vendor/github.com/bitrise-io/bitrise-init/utility/utility.go b/vendor/github.com/bitrise-io/bitrise-init/utility/utility.go index 86bc270..cd0de28 100644 --- a/vendor/github.com/bitrise-io/bitrise-init/utility/utility.go +++ b/vendor/github.com/bitrise-io/bitrise-init/utility/utility.go @@ -2,10 +2,7 @@ package utility import ( "encoding/json" - "errors" - "os" "path/filepath" - "regexp" "strings" "github.com/bitrise-io/go-utils/fileutil" @@ -58,167 +55,3 @@ func RelPath(basePth, pth string) (string, error) { return filepath.Rel(absBasePth, absPth) } - -// ListPathInDirSortedByComponents ... -func ListPathInDirSortedByComponents(searchDir string, relPath bool) ([]string, error) { - searchDir, err := filepath.Abs(searchDir) - if err != nil { - return []string{}, err - } - - fileList := []string{} - - if err := filepath.Walk(searchDir, func(path string, _ os.FileInfo, walkErr error) error { - if walkErr != nil { - return walkErr - } - - if relPath { - rel, err := filepath.Rel(searchDir, path) - if err != nil { - return err - } - path = rel - } - - fileList = append(fileList, path) - - return nil - }); err != nil { - return []string{}, err - } - return SortPathsByComponents(fileList) -} - -// FilterPaths ... -func FilterPaths(fileList []string, filters ...FilterFunc) ([]string, error) { - filtered := []string{} - - for _, pth := range fileList { - allowed := true - for _, filter := range filters { - if allows, err := filter(pth); err != nil { - return []string{}, err - } else if !allows { - allowed = false - break - } - } - if allowed { - filtered = append(filtered, pth) - } - } - - return filtered, nil -} - -// FilterFunc ... -type FilterFunc func(string) (bool, error) - -// BaseFilter ... -func BaseFilter(base string, allowed bool) FilterFunc { - return func(pth string) (bool, error) { - b := filepath.Base(pth) - return (allowed == strings.EqualFold(base, b)), nil - } -} - -// ExtensionFilter ... -func ExtensionFilter(ext string, allowed bool) FilterFunc { - return func(pth string) (bool, error) { - e := filepath.Ext(pth) - return (allowed == strings.EqualFold(ext, e)), nil - } -} - -// RegexpFilter ... -func RegexpFilter(pattern string, allowed bool) FilterFunc { - return func(pth string) (bool, error) { - re := regexp.MustCompile(pattern) - found := re.FindString(pth) != "" - return (allowed == found), nil - } -} - -// ComponentFilter ... -func ComponentFilter(component string, allowed bool) FilterFunc { - return func(pth string) (bool, error) { - found := false - pathComponents := strings.Split(pth, string(filepath.Separator)) - for _, c := range pathComponents { - if c == component { - found = true - } - } - return (allowed == found), nil - } -} - -// ComponentWithExtensionFilter ... -func ComponentWithExtensionFilter(ext string, allowed bool) FilterFunc { - return func(pth string) (bool, error) { - found := false - pathComponents := strings.Split(pth, string(filepath.Separator)) - for _, c := range pathComponents { - e := filepath.Ext(c) - if e == ext { - found = true - } - } - return (allowed == found), nil - } -} - -// IsDirectoryFilter ... -func IsDirectoryFilter(allowed bool) FilterFunc { - return func(pth string) (bool, error) { - fileInf, err := os.Lstat(pth) - if err != nil { - return false, err - } - if fileInf == nil { - return false, errors.New("no file info available") - } - return (allowed == fileInf.IsDir()), nil - } -} - -// InDirectoryFilter ... -func InDirectoryFilter(dir string, allowed bool) FilterFunc { - return func(pth string) (bool, error) { - in := (filepath.Dir(pth) == dir) - return (allowed == in), nil - } -} - -// DirectoryContainsFile returns a FilterFunc that checks if a directory contains a file -func DirectoryContainsFile(fileName string) FilterFunc { - return func(pth string) (bool, error) { - isDir, err := IsDirectoryFilter(true)(pth) - if err != nil { - return false, err - } - if !isDir { - return false, nil - } - - absPath := filepath.Join(pth, fileName) - if _, err := os.Lstat(absPath); err != nil { - if !os.IsNotExist(err) { - return false, err - } - return false, nil - } - return true, nil - } -} - -// FileContains ... -func FileContains(pth, str string) (bool, error) { - content, err := fileutil.ReadStringFromFile(pth) - if err != nil { - return false, err - } - - return strings.Contains(content, str), nil -} diff --git a/vendor/github.com/bitrise-io/bitrise-init/step/steperror.go b/vendor/github.com/bitrise-io/go-steputils/step/steperror.go similarity index 100% rename from vendor/github.com/bitrise-io/bitrise-init/step/steperror.go rename to vendor/github.com/bitrise-io/go-steputils/step/steperror.go diff --git a/vendor/github.com/bitrise-io/go-utils/pathutil/pathutil.go b/vendor/github.com/bitrise-io/go-utils/pathutil/pathutil.go index a88ff5f..957f4f7 100644 --- a/vendor/github.com/bitrise-io/go-utils/pathutil/pathutil.go +++ b/vendor/github.com/bitrise-io/go-utils/pathutil/pathutil.go @@ -184,3 +184,34 @@ func NormalizedOSTempDirPath(tmpDirNamePrefix string) (retPth string, err error) func GetFileName(path string) string { return strings.TrimSuffix(filepath.Base(path), filepath.Ext(path)) } + +// ListPathInDirSortedByComponents ... +func ListPathInDirSortedByComponents(searchDir string, relPath bool) ([]string, error) { + searchDir, err := filepath.Abs(searchDir) + if err != nil { + return []string{}, err + } + + var fileList []string + + if err := filepath.Walk(searchDir, func(path string, _ os.FileInfo, walkErr error) error { + if walkErr != nil { + return walkErr + } + + if relPath { + rel, err := filepath.Rel(searchDir, path) + if err != nil { + return err + } + path = rel + } + + fileList = append(fileList, path) + + return nil + }); err != nil { + return []string{}, err + } + return SortPathsByComponents(fileList) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 0633b07..1ae2789 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2,14 +2,13 @@ github.com/beevik/etree # github.com/bitrise-io/bitrise v0.0.0-20210513161711-09b1442cf3e0 github.com/bitrise-io/bitrise/models -# github.com/bitrise-io/bitrise-init v0.0.0-20210512085703-71cb279cf605 +# github.com/bitrise-io/bitrise-init v0.0.0-20210518124036-0b2b7f91bdb1 github.com/bitrise-io/bitrise-init/analytics github.com/bitrise-io/bitrise-init/models github.com/bitrise-io/bitrise-init/scanners/android -github.com/bitrise-io/bitrise-init/step github.com/bitrise-io/bitrise-init/steps github.com/bitrise-io/bitrise-init/utility -# github.com/bitrise-io/envman v0.0.0-20200512105748-919e33f391ee +# github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5 github.com/bitrise-io/envman/models # github.com/bitrise-io/go-android v0.0.0-20210517091621-72f0eb7a5197 github.com/bitrise-io/go-android/cache @@ -18,9 +17,10 @@ github.com/bitrise-io/go-steputils/cache github.com/bitrise-io/go-steputils/command/gems github.com/bitrise-io/go-steputils/command/rubycommand github.com/bitrise-io/go-steputils/input +github.com/bitrise-io/go-steputils/step github.com/bitrise-io/go-steputils/stepconf github.com/bitrise-io/go-steputils/tools -# github.com/bitrise-io/go-utils v0.0.0-20210514133945-9dd14e1c514a +# github.com/bitrise-io/go-utils v0.0.0-20210517140706-aa64fd88ca49 github.com/bitrise-io/go-utils/colorstring github.com/bitrise-io/go-utils/command github.com/bitrise-io/go-utils/errorutil @@ -31,10 +31,10 @@ github.com/bitrise-io/go-utils/parseutil github.com/bitrise-io/go-utils/pathutil github.com/bitrise-io/go-utils/pointers github.com/bitrise-io/go-utils/sliceutil -# github.com/bitrise-io/go-xcode v0.0.0-20210512084902-047d3c3d372a +# github.com/bitrise-io/go-xcode v0.0.0-20210517092111-792daa927657 github.com/bitrise-io/go-xcode/appleauth github.com/bitrise-io/go-xcode/devportalservice -# github.com/bitrise-io/stepman v0.0.0-20210505110307-5c2296bcc558 +# github.com/bitrise-io/stepman v0.0.0-20210517135458-203f7a48d37a github.com/bitrise-io/stepman/models # github.com/hashicorp/go-version v1.3.0 github.com/hashicorp/go-version