impr(ci): use brew bundle to install dependencies, and split test/dep… (#4816)

Author: armcknight

.github/workflows/build.yml

@@ -213,7 +213,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Debug
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \
@@ -231,7 +231,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Release
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \
@@ -249,7 +249,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Debug
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \
@@ -267,7 +267,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Release
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \

.github/workflows/test.yml

@@ -15,7 +15,7 @@ on:
       - "fastlane/**"
       - "scripts/tests-with-thread-sanitizer.sh"
       - "scripts/ci-select-xcode.sh"
-      - "scripts/xcode-test.sh"
+      - "scripts/sentry-xcodebuild.sh"
       - ".codecov.yml"
       - Sentry.xcodeproj
 
@@ -186,7 +186,7 @@ jobs:
       - name: Build tests
         id: build_tests
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform ${{matrix.platform}} \
             --os ${{matrix.test-destination-os}} \
             --ref ${{ github.ref_name }} \
@@ -201,7 +201,7 @@ jobs:
         # because GitHub Actions don't provide an easy way of
         # manipulating string in expressions.
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform ${{matrix.platform}} \
             --os ${{matrix.test-destination-os}} \
             --ref ${{ github.ref_name }} \

.github/workflows/ui-tests-critical.yml

@@ -67,10 +67,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Create ${{matrix.device}} (${{matrix.os-version}}) Simulator using Xcode ${{matrix.xcode}}
         run: ./scripts/create-simulator.sh "${{matrix.xcode}}" "${{matrix.os-version}}" "${{matrix.device}}" "${{matrix.force-sim-runtime}}"
-      - name: Install Maestro
-        run: brew tap mobile-dev-inc/tap && brew install mobile-dev-inc/tap/maestro@1.38
-      - name: Install iDB Companion
-        run: brew tap facebook/fb && brew install facebook/fb/idb-companion
+      - name: Install tooling
+        run: make init-ci-test
 
       - uses: actions/download-artifact@v4
         with:

Brewfile

@@ -3,3 +3,4 @@ brew 'swiftlint'
 brew 'pre-commit'
 brew 'python3'
 brew 'xcbeautify'
+brew 'rbenv'

Brewfile-ci-deploy

@@ -0,0 +1 @@
+brew 'carthage'

Brewfile-ci Brewfile-ci-testBrewfile-ci renamed to Brewfile-ci-test

@@ -2,5 +2,3 @@ tap 'facebook/fb'
 brew 'facebook/fb/idb-companion'
 tap 'mobile-dev-inc/tap'
 brew 'mobile-dev-inc/tap/maestro'
-brew 'carthage'
-brew 'rbenv'

Makefile

@@ -3,15 +3,21 @@ init:
 	which brew || /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 	brew bundle
 	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
+	clang-format --version | awk '{print $$3}' > scripts/.clang-format-version
+	swiftlint version > scripts/.swiftlint-version
+	
+# installs the tools needed to run CI test tasks locally
+.PHONY: init-ci-test
+init-ci-test:
+	brew bundle --file Brewfile-ci-test
+	
+# installs the tools needed to run CI deploy tasks locally (note that carthage is preinstalled in github actions)
+.PHONY: init-ci-deploy
+init-ci-deploy:
+	brew bundle --file Brewfile-ci-deploy
 
 .PHONY: check-versions
 check-versions:
@@ -41,7 +47,7 @@ GIT-REF := $(shell git rev-parse --abbrev-ref HEAD)
 
 test:
 	@echo "--> Running all tests"
-	./scripts/xcode-test.sh --platform iOS --os latest --ref $(GIT-REF) --command test --configuration Test
+	./scripts/sentry-xcodebuild.sh --platform iOS --os latest --ref $(GIT-REF) --command test --configuration Test
 	./scripts/xcode-slowest-tests.sh
 .PHONY: test
 

Sentry.xcodeproj/project.pbxproj

@@ -1823,6 +1823,7 @@
 		8459FCBF2BD73EB20038E9C9 /* SentryProfilerSerialization.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryProfilerSerialization.mm; sourceTree = "<group>"; };
 		8459FCC12BD73EEF0038E9C9 /* SentryProfilerSerialization+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentryProfilerSerialization+Test.h"; sourceTree = "<group>"; };
 		845C16D42A622A5B00EC9519 /* SentryTracer+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryTracer+Private.h"; path = "include/SentryTracer+Private.h"; sourceTree = "<group>"; };
+		846F90332D56F59D009E86C1 /* Brewfile-ci-deploy */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = "Brewfile-ci-deploy"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		848A45172BBF8D33006AAAEC /* SentryContinuousProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryContinuousProfiler.h; path = ../include/SentryContinuousProfiler.h; sourceTree = "<group>"; };
 		848A45182BBF8D33006AAAEC /* SentryContinuousProfiler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryContinuousProfiler.mm; sourceTree = "<group>"; };
 		848A451B2BBF9504006AAAEC /* SentryProfilerTestHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfilerTestHelpers.h; path = ../include/SentryProfilerTestHelpers.h; sourceTree = "<group>"; };
@@ -1836,7 +1837,7 @@
 		849B8F962C6E906900148E1F /* SentryUserFeedbackIntegrationDriver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SentryUserFeedbackIntegrationDriver.swift; sourceTree = "<group>"; };
 		849B8F972C6E906900148E1F /* SentryUserFeedbackThemeConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SentryUserFeedbackThemeConfiguration.swift; path = Configuration/SentryUserFeedbackThemeConfiguration.swift; sourceTree = "<group>"; };
 		849B8F982C6E906900148E1F /* SentryUserFeedbackWidgetConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SentryUserFeedbackWidgetConfiguration.swift; path = Configuration/SentryUserFeedbackWidgetConfiguration.swift; sourceTree = "<group>"; };
-		849DF0522D00270A00A202DF /* Brewfile-ci */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = "Brewfile-ci"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		849DF0522D00270A00A202DF /* Brewfile-ci-test */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = "Brewfile-ci-test"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		84A305472BC72A0A00D84283 /* SentryAppLaunchProfilingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryAppLaunchProfilingTests.swift; sourceTree = "<group>"; };
 		84A305552BC9EF8C00D84283 /* SentryTraceProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryTraceProfiler.h; path = ../include/SentryTraceProfiler.h; sourceTree = "<group>"; };
 		84A305562BC9EF8C00D84283 /* SentryTraceProfiler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryTraceProfiler.mm; sourceTree = "<group>"; };
@@ -4040,7 +4041,8 @@
 				844DA80A28246D5000E6B62E /* .swiftlint.yml */,
 				843BD6282AD8752300B0098F /* .clang-format */,
 				844DA80B28246D5000E6B62E /* Brewfile */,
-				849DF0522D00270A00A202DF /* Brewfile-ci */,
+				849DF0522D00270A00A202DF /* Brewfile-ci-test */,
+				846F90332D56F59D009E86C1 /* Brewfile-ci-deploy */,
 			);
 			name = Aux;
 			sourceTree = "<group>";