From b34716ff800b7d98b9038a8d7277df7db9d8b76a Mon Sep 17 00:00:00 2001 From: Andrew McKnight Date: Wed, 4 Dec 2024 00:00:25 -0900 Subject: [PATCH] meta: split up local and ci homebrew formula (#4593) --- Brewfile | 6 ------ Brewfile-ci | 6 ++++++ Makefile | 10 +++++++--- Sentry.xcodeproj/project.pbxproj | 2 ++ 4 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 Brewfile-ci diff --git a/Brewfile b/Brewfile index f126759a357..e2bb210021d 100644 --- a/Brewfile +++ b/Brewfile @@ -1,10 +1,4 @@ brew 'clang-format' brew 'swiftlint' -brew 'carthage' -brew 'rbenv' brew 'pre-commit' brew 'python3' -tap 'facebook/fb' -brew 'facebook/fb/idb-companion' -tap 'mobile-dev-inc/tap' -brew 'mobile-dev-inc/tap/maestro' diff --git a/Brewfile-ci b/Brewfile-ci new file mode 100644 index 00000000000..66e045d3273 --- /dev/null +++ b/Brewfile-ci @@ -0,0 +1,6 @@ +tap 'facebook/fb' +brew 'facebook/fb/idb-companion' +tap 'mobile-dev-inc/tap' +brew 'mobile-dev-inc/tap/maestro' +brew 'carthage' +brew 'rbenv' diff --git a/Makefile b/Makefile index f6cb3439897..00a231e3ca2 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,16 @@ init: which brew || /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" brew bundle - rbenv install --skip-existing - rbenv exec gem update bundler - rbenv exec bundle install pre-commit install clang-format --version | awk '{print $3}' > scripts/.clang-format-version swiftlint version > scripts/.swiftlint-version + +# installs the tools needed to test various CI tasks locally +init-ci: init + brew bundle --file Brewfile-ci + rbenv install --skip-existing + rbenv exec gem update bundler + rbenv exec bundle install .PHONY: check-versions check-versions: diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj index f0ede668c98..60898b55ea9 100644 --- a/Sentry.xcodeproj/project.pbxproj +++ b/Sentry.xcodeproj/project.pbxproj @@ -1749,6 +1749,7 @@ 849B8F962C6E906900148E1F /* SentryUserFeedbackIntegrationDriver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SentryUserFeedbackIntegrationDriver.swift; sourceTree = ""; }; 849B8F972C6E906900148E1F /* SentryUserFeedbackThemeConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SentryUserFeedbackThemeConfiguration.swift; path = Configuration/SentryUserFeedbackThemeConfiguration.swift; sourceTree = ""; }; 849B8F982C6E906900148E1F /* SentryUserFeedbackWidgetConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SentryUserFeedbackWidgetConfiguration.swift; path = Configuration/SentryUserFeedbackWidgetConfiguration.swift; sourceTree = ""; }; + 849DF0522D00270A00A202DF /* Brewfile-ci */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = "Brewfile-ci"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 84A305472BC72A0A00D84283 /* SentryAppLaunchProfilingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryAppLaunchProfilingTests.swift; sourceTree = ""; }; 84A305552BC9EF8C00D84283 /* SentryTraceProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryTraceProfiler.h; path = ../include/SentryTraceProfiler.h; sourceTree = ""; }; 84A305562BC9EF8C00D84283 /* SentryTraceProfiler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryTraceProfiler.mm; sourceTree = ""; }; @@ -3830,6 +3831,7 @@ 844DA80A28246D5000E6B62E /* .swiftlint.yml */, 843BD6282AD8752300B0098F /* .clang-format */, 844DA80B28246D5000E6B62E /* Brewfile */, + 849DF0522D00270A00A202DF /* Brewfile-ci */, ); name = Aux; sourceTree = "";