From 3640aaf7849a9fc39996d777e6df866251bb98d6 Mon Sep 17 00:00:00 2001 From: getsentry-bot Date: Thu, 13 Feb 2025 14:58:45 +0000 Subject: [PATCH 1/5] release: 8.45.0 --- .github/last-release-runid | 2 +- CHANGELOG.md | 2 +- Package.swift | 8 ++++---- Samples/iOS-Swift/iOS-Swift/Sample.xcconfig | 2 +- Sentry.podspec | 2 +- SentryPrivate.podspec | 2 +- SentrySwiftUI.podspec | 4 ++-- Sources/Configuration/SDK.xcconfig | 2 +- Sources/Configuration/SentrySwiftUI.xcconfig | 2 +- Sources/Sentry/SentryMeta.m | 2 +- Tests/HybridSDKTest/HybridPod.podspec | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/last-release-runid b/.github/last-release-runid index be4cec2af8..47d68c27d2 100644 --- a/.github/last-release-runid +++ b/.github/last-release-runid @@ -1 +1 @@ -13055337413 +13310146035 diff --git a/CHANGELOG.md b/CHANGELOG.md index d88381022e..fc7c5278a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## 8.45.0 ### Features diff --git a/Package.swift b/Package.swift index 2996989827..369f5f81ca 100644 --- a/Package.swift +++ b/Package.swift @@ -12,13 +12,13 @@ let package = Package( targets: [ .binaryTarget( name: "Sentry", - url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.44.0/Sentry.xcframework.zip", - checksum: "78388f70054b713bf251ab6df61f2b7b900c093cbfb23c91cc91b52f26016a8b" //Sentry-Static + url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.45.0/Sentry.xcframework.zip", + checksum: "03789c7a610c4d9aebb36804a8d5521084cc7459e0333ff7be2d3c380b3d405a" //Sentry-Static ), .binaryTarget( name: "Sentry-Dynamic", - url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.44.0/Sentry-Dynamic.xcframework.zip", - checksum: "28ece75e6a8e0e0f5ed00ff4b7ef3a7dcc379747239f9a1aded9838e6a0a0dc6" //Sentry-Dynamic + url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.45.0/Sentry-Dynamic.xcframework.zip", + checksum: "7bd0ec34705400853ceb99816a801b82251a18ea8f0ba5bce1366c7c2a61eacf" //Sentry-Dynamic ), .target ( name: "SentrySwiftUI", dependencies: ["Sentry", "SentryInternal"], diff --git a/Samples/iOS-Swift/iOS-Swift/Sample.xcconfig b/Samples/iOS-Swift/iOS-Swift/Sample.xcconfig index 3a6c354379..27fd57d26d 100644 --- a/Samples/iOS-Swift/iOS-Swift/Sample.xcconfig +++ b/Samples/iOS-Swift/iOS-Swift/Sample.xcconfig @@ -1 +1 @@ -MARKETING_VERSION = 8.44.0 +MARKETING_VERSION = 8.45.0 diff --git a/Sentry.podspec b/Sentry.podspec index c188f721de..3d3b1f33ef 100644 --- a/Sentry.podspec +++ b/Sentry.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Sentry" - s.version = "8.44.0" + s.version = "8.45.0" s.summary = "Sentry client for cocoa" s.homepage = "https://github.com/getsentry/sentry-cocoa" s.license = "mit" diff --git a/SentryPrivate.podspec b/SentryPrivate.podspec index bafc21ed79..49ed03bf29 100644 --- a/SentryPrivate.podspec +++ b/SentryPrivate.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SentryPrivate" - s.version = "8.44.0" + s.version = "8.45.0" s.summary = "Sentry Private Library." s.homepage = "https://github.com/getsentry/sentry-cocoa" s.license = "mit" diff --git a/SentrySwiftUI.podspec b/SentrySwiftUI.podspec index fd16e60aef..e48c7749a2 100644 --- a/SentrySwiftUI.podspec +++ b/SentrySwiftUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SentrySwiftUI" - s.version = "8.44.0" + s.version = "8.45.0" s.summary = "Sentry client for SwiftUI" s.homepage = "https://github.com/getsentry/sentry-cocoa" s.license = "mit" @@ -19,5 +19,5 @@ Pod::Spec.new do |s| s.watchos.framework = 'WatchKit' s.source_files = "Sources/SentrySwiftUI/**/*.{swift,h,m}" - s.dependency 'Sentry/HybridSDK', "8.44.0" + s.dependency 'Sentry/HybridSDK', "8.45.0" end diff --git a/Sources/Configuration/SDK.xcconfig b/Sources/Configuration/SDK.xcconfig index 8ca8271d82..8b4b99721d 100644 --- a/Sources/Configuration/SDK.xcconfig +++ b/Sources/Configuration/SDK.xcconfig @@ -10,7 +10,7 @@ DYLIB_INSTALL_NAME_BASE = @rpath MACH_O_TYPE = mh_dylib FRAMEWORK_VERSION = A -CURRENT_PROJECT_VERSION = 8.44.0 +CURRENT_PROJECT_VERSION = 8.45.0 ALWAYS_SEARCH_USER_PATHS = NO CLANG_ENABLE_OBJC_ARC = YES diff --git a/Sources/Configuration/SentrySwiftUI.xcconfig b/Sources/Configuration/SentrySwiftUI.xcconfig index 5feb731506..7fa1411789 100644 --- a/Sources/Configuration/SentrySwiftUI.xcconfig +++ b/Sources/Configuration/SentrySwiftUI.xcconfig @@ -1,5 +1,5 @@ PRODUCT_NAME = SentrySwiftUI -CURRENT_PROJECT_VERSION = 8.44.0 +CURRENT_PROJECT_VERSION = 8.45.0 MACOSX_DEPLOYMENT_TARGET = 10.15 IPHONEOS_DEPLOYMENT_TARGET = 13.0 diff --git a/Sources/Sentry/SentryMeta.m b/Sources/Sentry/SentryMeta.m index 8929e4c814..796890bf8b 100644 --- a/Sources/Sentry/SentryMeta.m +++ b/Sources/Sentry/SentryMeta.m @@ -5,7 +5,7 @@ @implementation SentryMeta // Don't remove the static keyword. If you do the compiler adds the constant name to the global // symbol table and it might clash with other constants. When keeping the static keyword the // compiler replaces all occurrences with the value. -static NSString *versionString = @"8.44.0"; +static NSString *versionString = @"8.45.0"; static NSString *sdkName = @"sentry.cocoa"; + (NSString *)versionString diff --git a/Tests/HybridSDKTest/HybridPod.podspec b/Tests/HybridSDKTest/HybridPod.podspec index 8f73d6cf4b..3bf1b6eca3 100644 --- a/Tests/HybridSDKTest/HybridPod.podspec +++ b/Tests/HybridSDKTest/HybridPod.podspec @@ -13,6 +13,6 @@ Pod::Spec.new do |s| s.requires_arc = true s.frameworks = 'Foundation' s.swift_versions = "5.5" - s.dependency "Sentry/HybridSDK", "8.44.0" + s.dependency "Sentry/HybridSDK", "8.45.0" s.source_files = "HybridTest.swift" end From d1988b7fffa83f712fa55be8e016ced9a832225f Mon Sep 17 00:00:00 2001 From: Andrew McKnight Date: Thu, 13 Feb 2025 10:01:10 -0900 Subject: [PATCH 2/5] chore(ci): update ruby version to match github actions (#4819) --- .ruby-version | 2 +- scripts/check-tooling-versions.sh | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.ruby-version b/.ruby-version index be94e6f53d..15a2799817 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.3.0 diff --git a/scripts/check-tooling-versions.sh b/scripts/check-tooling-versions.sh index 4be4141d77..23897657ac 100755 --- a/scripts/check-tooling-versions.sh +++ b/scripts/check-tooling-versions.sh @@ -1,17 +1,31 @@ #!/usr/bin/env bash REMOTE_CLANG_FORMAT_VERSION=$(cat scripts/.clang-format-version) -REMOTE_SWIFTLINT_VERSION=$(cat scripts/.swiftlint-version) LOCAL_CLANG_FORMAT_VERSION=$(clang-format --version | awk '{print $3}') + +REMOTE_SWIFTLINT_VERSION=$(cat scripts/.swiftlint-version) LOCAL_SWIFTLINT_VERSION=$(swiftlint version) -RESOLUTION_MESSAGE="Please run \`make init\` to update your local dev tools. This may actually upgrade to a newer version than what is currently recorded in the lockfile; if that happens, please commit the update to the lockfile as well." + +RESOLUTION_MESSAGE="Please run \`make init\` to update your local dev tools. This may actually upgrade to a newer version than what is currently recorded in repo; if that happens, please commit the update to the any lockfiles etc as well." + +SENTRY_TOOLING_UP_TO_DATE=true if [ "${LOCAL_CLANG_FORMAT_VERSION}" != "${REMOTE_CLANG_FORMAT_VERSION}" ]; then - echo "clang-format version mismatch, expected: ${REMOTE_CLANG_FORMAT_VERSION}, but found: ${LOCAL_CLANG_FORMAT_VERSION}. ${RESOLUTION_MESSAGE}" - exit 1 + echo "clang-format version mismatch, expected: ${REMOTE_CLANG_FORMAT_VERSION}, but found: ${LOCAL_CLANG_FORMAT_VERSION}" + SENTRY_TOOLING_UP_TO_DATE=false fi if [ "${LOCAL_SWIFTLINT_VERSION}" != "${REMOTE_SWIFTLINT_VERSION}" ]; then - echo "swiftlint version mismatch, expected: ${REMOTE_SWIFTLINT_VERSION}, but found: ${LOCAL_SWIFTLINT_VERSION}. ${RESOLUTION_MESSAGE}" + echo "swiftlint version mismatch, expected: ${REMOTE_SWIFTLINT_VERSION}, but found: ${LOCAL_SWIFTLINT_VERSION}" + SENTRY_TOOLING_UP_TO_DATE=false +fi + +if ! rbenv version 2>/dev/null; then + rbenv versions + SENTRY_TOOLING_UP_TO_DATE=false +fi + +if [ $SENTRY_TOOLING_UP_TO_DATE == false ]; then + echo "${RESOLUTION_MESSAGE}" exit 1 fi From ea543752e17742f4686699be76afaf3278129c4c Mon Sep 17 00:00:00 2001 From: Andrew McKnight Date: Thu, 13 Feb 2025 12:03:07 -0900 Subject: [PATCH 3/5] chore(test): use correct capitalization for function "without" "logs" (#4827) --- SentryTestUtils/SentryLogExtensions.swift | 2 +- .../Integrations/ANR/SentryANRTrackerV2Tests.swift | 8 ++++---- .../Feedback/SentryFeedbackTests.swift | 2 +- .../Networking/SentryHttpTransportTests.swift | 14 +++++++------- Tests/SentryTests/SentrySDKTests.swift | 2 +- .../Transaction/SentryTracerTests.swift | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SentryTestUtils/SentryLogExtensions.swift b/SentryTestUtils/SentryLogExtensions.swift index 928512568f..f8428923a6 100644 --- a/SentryTestUtils/SentryLogExtensions.swift +++ b/SentryTestUtils/SentryLogExtensions.swift @@ -12,7 +12,7 @@ extension SentryLog { /// SentryLog uses NSLog internally, which can significantly slow down code because it requires /// synchronization. Tests that need code to run fast should can turn off logs to avoid flakiness. - public static func withOutLogs(_ closure: () throws -> T) rethrows -> T { + public static func withoutLogs(_ closure: () throws -> T) rethrows -> T { defer { setTestDefaultLogLevel() } disable() return try closure() diff --git a/Tests/SentryTests/Integrations/ANR/SentryANRTrackerV2Tests.swift b/Tests/SentryTests/Integrations/ANR/SentryANRTrackerV2Tests.swift index 1164b89773..3552e4fdc3 100644 --- a/Tests/SentryTests/Integrations/ANR/SentryANRTrackerV2Tests.swift +++ b/Tests/SentryTests/Integrations/ANR/SentryANRTrackerV2Tests.swift @@ -310,7 +310,7 @@ class SentryANRTrackerV2Tests: XCTestCase { // This would print thousands of logs so we execute it without // to avoid spamming the test logs. - SentryLog.withOutLogs { + SentryLog.withoutLogs { wait(for: [firstListener.anrDetectedExpectation, firstListener.anrStoppedExpectation, thirdListener.anrStoppedExpectation, thirdListener.anrDetectedExpectation], timeout: waitTimeout) } @@ -366,7 +366,7 @@ class SentryANRTrackerV2Tests: XCTestCase { // This would print thousands of logs so we execute it without // to avoid spamming the test logs. - SentryLog.withOutLogs { + SentryLog.withoutLogs { wait(for: [listener.anrDetectedExpectation, listener.anrStoppedExpectation], timeout: waitTimeout) } } @@ -391,7 +391,7 @@ class SentryANRTrackerV2Tests: XCTestCase { // This would print thousands of logs so we execute it without // to avoid spamming the test logs. - SentryLog.withOutLogs { + SentryLog.withoutLogs { wait(for: [listener.anrDetectedExpectation, listener.anrStoppedExpectation], timeout: waitTimeout) } } @@ -515,7 +515,7 @@ class SentryANRTrackerV2Tests: XCTestCase { // This would print thousands of logs so we execute it without // to avoid spamming the test logs. - SentryLog.withOutLogs { + SentryLog.withoutLogs { wait(for: [listener.anrDetectedExpectation, listener.anrStoppedExpectation], timeout: waitTimeout) } } diff --git a/Tests/SentryTests/Integrations/Feedback/SentryFeedbackTests.swift b/Tests/SentryTests/Integrations/Feedback/SentryFeedbackTests.swift index 0d354b623a..d8b8d3da6d 100644 --- a/Tests/SentryTests/Integrations/Feedback/SentryFeedbackTests.swift +++ b/Tests/SentryTests/Integrations/Feedback/SentryFeedbackTests.swift @@ -145,7 +145,7 @@ class SentryFeedbackTests: XCTestCase { func testCaseDescription() -> String { "(config: (requiresName: \(input.config.requiresName), requiresEmail: \(input.config.requiresEmail), nameInput: \(input.config.nameInput == nil ? "nil" : "\"\(input.config.nameInput!)\""), emailInput: \(input.config.emailInput == nil ? "nil" : "\"\(input.config.emailInput!)\""), messageInput: \(input.config.messageInput == nil ? "nil" : "\"\(input.config.messageInput!)\""), includeScreenshot: \(input.config.includeScreenshot)), expectedSubmitButtonAccessibilityHint: \(input.expectedSubmitButtonAccessibilityHint)" } - SentryLog.withOutLogs { + SentryLog.withoutLogs { switch viewModel.validate() { case .success(let hint): XCTAssert(input.shouldValidate) diff --git a/Tests/SentryTests/Networking/SentryHttpTransportTests.swift b/Tests/SentryTests/Networking/SentryHttpTransportTests.swift index 8b661eb95c..1913282cd1 100644 --- a/Tests/SentryTests/Networking/SentryHttpTransportTests.swift +++ b/Tests/SentryTests/Networking/SentryHttpTransportTests.swift @@ -799,7 +799,7 @@ class SentryHttpTransportTests: XCTestCase { givenCachedEvents(amount: 30) fixture.requestManager.responseDelay = fixture.flushTimeout + 0.2 - SentryLog.withOutLogs { + SentryLog.withoutLogs { let beforeFlush = getAbsoluteTime() let result = sut.flush(fixture.flushTimeout) let blockingDuration = getDurationNs(beforeFlush, getAbsoluteTime()).toTimeInterval() @@ -814,7 +814,7 @@ class SentryHttpTransportTests: XCTestCase { func testFlush_BlocksCallingThread_FinishesFlushingWhenSent() { givenCachedEvents(amount: 1) - SentryLog.withOutLogs { + SentryLog.withoutLogs { let beforeFlush = getAbsoluteTime() XCTAssertEqual(.success, sut.flush(fixture.flushTimeout), "Flush should not time out.") @@ -827,7 +827,7 @@ class SentryHttpTransportTests: XCTestCase { func testFlush_CalledSequentially_BlocksTwice() { givenCachedEvents() - SentryLog.withOutLogs { + SentryLog.withoutLogs { let beforeFlush = getAbsoluteTime() XCTAssertEqual(.success, sut.flush(fixture.flushTimeout), "Flush should not time out.") @@ -845,7 +845,7 @@ class SentryHttpTransportTests: XCTestCase { var blockingDurationSum: TimeInterval = 0.0 let flushInvocations = 100 - SentryLog.withOutLogs { + SentryLog.withoutLogs { for _ in 0.. Date: Thu, 13 Feb 2025 12:30:44 -0900 Subject: [PATCH 4/5] =?UTF-8?q?impr(ci):=20use=20brew=20bundle=20to=20inst?= =?UTF-8?q?all=20dependencies,=20and=20split=20test/dep=E2=80=A6=20(#4816)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 8 ++++---- .github/workflows/test.yml | 6 +++--- .github/workflows/ui-tests-critical.yml | 6 ++---- Brewfile | 1 + Brewfile-ci-deploy | 1 + Brewfile-ci => Brewfile-ci-test | 2 -- Makefile | 20 ++++++++++++------- Sentry.xcodeproj/project.pbxproj | 6 ++++-- .../{xcode-test.sh => sentry-xcodebuild.sh} | 0 9 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 Brewfile-ci-deploy rename Brewfile-ci => Brewfile-ci-test (79%) rename scripts/{xcode-test.sh => sentry-xcodebuild.sh} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e7af8a3ac..3a3c807312 100644 --- a/.github/workflows/build.yml +++ b/.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 }} \ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1ba97e7cf..b585d7a3a4 100644 --- a/.github/workflows/test.yml +++ b/.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 }} \ diff --git a/.github/workflows/ui-tests-critical.yml b/.github/workflows/ui-tests-critical.yml index 79e7410ba7..dedfa29f12 100644 --- a/.github/workflows/ui-tests-critical.yml +++ b/.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: diff --git a/Brewfile b/Brewfile index 4af67e1d8a..3d935edb0f 100644 --- a/Brewfile +++ b/Brewfile @@ -3,3 +3,4 @@ brew 'swiftlint' brew 'pre-commit' brew 'python3' brew 'xcbeautify' +brew 'rbenv' diff --git a/Brewfile-ci-deploy b/Brewfile-ci-deploy new file mode 100644 index 0000000000..a56b4f9953 --- /dev/null +++ b/Brewfile-ci-deploy @@ -0,0 +1 @@ +brew 'carthage' diff --git a/Brewfile-ci b/Brewfile-ci-test similarity index 79% rename from Brewfile-ci rename to Brewfile-ci-test index 66e045d327..88f78fa423 100644 --- a/Brewfile-ci +++ b/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' diff --git a/Makefile b/Makefile index cfe6c4916f..ed652a96fa 100644 --- a/Makefile +++ b/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 diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj index 30e4d226b2..9963785277 100644 --- a/Sentry.xcodeproj/project.pbxproj +++ b/Sentry.xcodeproj/project.pbxproj @@ -1823,6 +1823,7 @@ 8459FCBF2BD73EB20038E9C9 /* SentryProfilerSerialization.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryProfilerSerialization.mm; sourceTree = ""; }; 8459FCC12BD73EEF0038E9C9 /* SentryProfilerSerialization+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentryProfilerSerialization+Test.h"; sourceTree = ""; }; 845C16D42A622A5B00EC9519 /* SentryTracer+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryTracer+Private.h"; path = "include/SentryTracer+Private.h"; sourceTree = ""; }; + 846F90332D56F59D009E86C1 /* Brewfile-ci-deploy */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = "Brewfile-ci-deploy"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 848A45172BBF8D33006AAAEC /* SentryContinuousProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryContinuousProfiler.h; path = ../include/SentryContinuousProfiler.h; sourceTree = ""; }; 848A45182BBF8D33006AAAEC /* SentryContinuousProfiler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryContinuousProfiler.mm; sourceTree = ""; }; 848A451B2BBF9504006AAAEC /* SentryProfilerTestHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfilerTestHelpers.h; path = ../include/SentryProfilerTestHelpers.h; sourceTree = ""; }; @@ -1836,7 +1837,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; }; + 849DF0522D00270A00A202DF /* Brewfile-ci-test */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = "Brewfile-ci-test"; 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 = ""; }; @@ -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 = ""; diff --git a/scripts/xcode-test.sh b/scripts/sentry-xcodebuild.sh similarity index 100% rename from scripts/xcode-test.sh rename to scripts/sentry-xcodebuild.sh From a286774f1f994d1d78f7f959e17dd7fc8b10880a Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Fri, 14 Feb 2025 09:18:40 +0100 Subject: [PATCH 5/5] chore(ci): add release version to workflow title (#4844) --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03a432b67b..51c57ec144 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Release +name: Release ${{ github.event.inputs.version }} on: workflow_dispatch: inputs: