From c3e3d9971155f455c75787c8096b9deda8097afe Mon Sep 17 00:00:00 2001 From: Brodie Daff Date: Fri, 18 Feb 2022 16:27:48 +1100 Subject: [PATCH] Fix xcodebuild version parsing on M1 mac --- vendor/github.com/bitrise-io/go-xcode/utility/utility.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vendor/github.com/bitrise-io/go-xcode/utility/utility.go b/vendor/github.com/bitrise-io/go-xcode/utility/utility.go index 5d605c59..e0b06b42 100644 --- a/vendor/github.com/bitrise-io/go-xcode/utility/utility.go +++ b/vendor/github.com/bitrise-io/go-xcode/utility/utility.go @@ -2,6 +2,7 @@ package utility import ( "fmt" + "regexp" "strconv" "strings" @@ -44,8 +45,13 @@ func getXcodeVersionFromXcodebuildOutput(outStr string) (models.XcodebuildVersio func GetXcodeVersion() (models.XcodebuildVersionModel, error) { cmd := command.New("xcodebuild", "-version") outStr, err := cmd.RunAndReturnTrimmedCombinedOutput() + + // Ignore unrelated warnings on Apple silicon + r, _ := regexp.Compile("(objc.+\n)") + filtered := r.ReplaceAllString(outStr, "") + if err != nil { return models.XcodebuildVersionModel{}, fmt.Errorf("xcodebuild -version failed, err: %s, details: %s", err, outStr) } - return getXcodeVersionFromXcodebuildOutput(outStr) + return getXcodeVersionFromXcodebuildOutput(filtered) }