Merge branch '8.0.0' into ref/rename-classes

* 8.0.0: ref: Fix typos in OOMTracker (#2431) ref: Make SpanProtocol.data non nullable (#2409) ref: add/improve logging (#2420) ref: bump supported OS versions (#2414) test: shorten some tests (#2428) ref: Remove `- [SentryOptions initWithDict:didFailWithError:]` (#2404) ref: Mark [SpanProtocol setExtraValue:forKey] as deprecated (#2413) typos (#2421) test: Disable NSDataTracker in clearTestState (#2418) Update CHANGELOG.md (#2415) feat: Properly demangle Swift class name (#2162) chore: Create 8.0.0 branch test: include Sentry changes in hash keys (#2412) release: 7.31.2 fix: Crash in Client when reading integrations (#2398) test: tooling improvements (#2400) fix: Don't increase session's error count for dropped events (#2374) Update CHANGELOG.md (#2396) release: 7.31.1 Fix: Set the correct OOM event timestamp (#2394) # Conflicts: # Sentry.xcodeproj/project.pbxproj # SentryPrivate.podspec # scripts/add-sentry-to-vlc.patch
getsentry · Nov 22, 2022 · 5a09cc5 · 5a09cc5
2 parents 1322a1e + 4dc66f6
commit 5a09cc5
Show file tree

Hide file tree

Showing 93 changed files with 922 additions and 1,596 deletions.
diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+      - 8.0.0
 
   pull_request:
     paths:
@@ -37,7 +38,7 @@ jobs:
           path: |
             DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
             DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
-          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}
+          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-${{ hashFiles('Sentry/Sources/**') }}
       - name: Cache iOS-Swift UI Test Runner App build product
         id: ios-swift-benchmark-runner-cache
         uses: actions/cache@v3

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - 8.0.0
       - release/**
 
   pull_request:

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - 8.0.0
 
   pull_request:
     paths:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - 8.0.0
     paths:
       - 'Sources/**'
       - 'Tests/**'

diff --git a/.github/workflows/profile-data-generator.yml b/.github/workflows/profile-data-generator.yml
@@ -30,7 +30,7 @@ jobs:
           path: |
             DerivedData/Build/Products/Debug-iphoneos/TrendingMovies.app
             DerivedData/Build/Products/Debug-iphoneos/TrendingMovies.app.dSYM
-          key: trendingmovies-app-cache-key-${{ hashFiles('Samples/TrendingMovies/TrendingMovies/**') }}
+          key: trendingmovies-app-cache-key-${{ hashFiles('Samples/TrendingMovies/TrendingMovies/**') }}-${{ hashFiles('Sentry/Sources/**') }}
       - name: Cache ProfileDataGenerator UI Test Runner App build product
         id: cache-profiledatagenerator-test-runner-app
         uses: actions/cache@v3

diff --git a/.github/workflows/saucelabs-UI-tests.yml b/.github/workflows/saucelabs-UI-tests.yml
@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - master
+      - 8.0.0
 
   pull_request:
     paths:
@@ -44,7 +45,7 @@ jobs:
           path: |
             DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
             DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
-          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-Xcode-${{ matrix.xcode }}
+          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-Xcode-${{ matrix.xcode }}-${{ hashFiles('Sentry/Sources/**') }}
       - name: Cache iOS-Swift UI Test Runner App build product
         id: ios-swift-uitest-runner-cache
         uses: actions/cache@v3
@@ -102,11 +103,6 @@ jobs:
           - xcode: '13.4.1'
             suite: 'iOS-13'
 
-          # iOS 12 has a failing test that we need to fix https://github.com/getsentry/sentry-cocoa/issues/1566
-          # iOS 11 keeps timing out and we don't know how to fix it.
-          - xcode: '12.5.1'
-            suite: 'iOS-10'
-
     steps:
       - uses: actions/checkout@v3
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - 8.0.0
       - release/**
 
   pull_request:
@@ -37,7 +38,7 @@ jobs:
         if: steps.cache_test_server.outputs.cache-hit != 'true'
         working-directory: test-server
         run: >-
-          swift build -c release
+          swift build -c release 2>&1 | tee test-server-build.log
 
       - name: Copy exec
         working-directory: test-server
@@ -50,6 +51,14 @@ jobs:
           path: |
             ./test-server/test-server-exec
 
+      - name: Archiving Raw Test Logs
+        uses: actions/upload-artifact@v3
+        if: ${{  failure() || cancelled() }}
+        with:
+          name: test-server-build-log-${{matrix.platform}}-xcode-${{matrix.xcode}}-os-${{matrix.test-destination-os}}
+          path: |
+            raw-test-output.log
+
   unit-tests:
     name: Unit ${{matrix.platform}} - Xcode ${{matrix.xcode}} - OS ${{matrix.test-destination-os}}
     runs-on: ${{matrix.runs-on}}
@@ -169,7 +178,7 @@ jobs:
         # passed to xcodebuild doesn't end up in the job name,
         # because GitHub Actions don't provide an easy way of
         # manipulating string in expressions.
-        run: ./scripts/xcode-test.sh ${{matrix.platform}} ${{matrix.test-destination-os}} ${{matrix.xcode}} $GITHUB_REF_NAME
+        run: ./scripts/xcode-test.sh ${{matrix.platform}} ${{matrix.test-destination-os}} $GITHUB_REF_NAME
 
       - name: Archiving DerivedData Logs
         uses: actions/upload-artifact@v3
@@ -236,7 +245,7 @@ jobs:
   ui-tests:
     name: UI Tests for ${{matrix.target}} on Simulators
     runs-on: macos-12
-    strategy:
+    strategy: 
       matrix:
         target: ['ios_swift', 'ios_objc', 'tvos_swift']
 
@@ -249,6 +258,15 @@ jobs:
         run: for i in {1..2}; do fastlane ui_tests_${{matrix.target}} && break ; done
         shell: sh
 
+      - name: Archiving Raw Test Logs
+        uses: actions/upload-artifact@v3
+        if: ${{  failure() || cancelled() }}
+        with:
+          name: raw-test-output-${{matrix.platform}}-xcode-${{matrix.xcode}}-os-${{matrix.test-destination-os}}
+          path: |
+            ~/Library/Logs/scan/*.log
+            ./fastlane/test_output/**
+
   # SwiftUI only supports iOS 14+ so we run it in a separate matrix here
   ui-tests-swift-ui:
     name: UI Tests for SwiftUI on ${{matrix.device}} Simulator
@@ -274,6 +292,15 @@ jobs:
         run: for i in {1..2}; do fastlane ui_tests_ios_swiftui device:"${{matrix.device}}" && break ; done
         shell: sh
 
+      - name: Archiving Raw Test Logs
+        uses: actions/upload-artifact@v3
+        if: ${{  failure() || cancelled() }}
+        with:
+          name: raw-swiftui-test-output-${{matrix.platform}}-xcode-${{matrix.xcode}}-os-${{matrix.test-destination-os}}
+          path: |
+            ~/Library/Logs/scan/*.log
+            ./fastlane/test_output/**
+
   # macos-11 doesn't have a simulator for iOS 12
   ui-tests-swift-ios-12:
     name: UI Tests on iOS 12 Simulator
@@ -297,6 +324,15 @@ jobs:
         run: for i in {1..2}; do fastlane ui_tests_${{matrix.target}} device:"iPhone 8 (12.4)" address_sanitizer:false && break ; done
         shell: sh
 
+      - name: Archiving Raw Test Logs
+        uses: actions/upload-artifact@v3
+        if: ${{  failure() || cancelled() }}
+        with:
+          name: raw-test-output-${{matrix.platform}}-xcode-${{matrix.xcode}}-os-${{matrix.test-destination-os}}
+          path: |
+            ~/Library/Logs/scan/*.log
+            ./fastlane/test_output/**
+
   ui-tests-address-sanitizer:
     name: UI Tests with Address Sanitizer
     runs-on: macos-12
@@ -309,3 +345,12 @@ jobs:
       - name: Run Fastlane
         run: for i in {1..2}; do fastlane ui_tests_ios_swift device:"$iPhone 8 (15.5)" address_sanitizer:true && break ; done
         shell: sh
+
+      - name: Archiving Raw Test Logs
+        uses: actions/upload-artifact@v3
+        if: ${{  failure() || cancelled() }}
+        with:
+          name: raw-test-output-${{matrix.platform}}-xcode-${{matrix.xcode}}-os-${{matrix.test-destination-os}}
+          path: |
+            ~/Library/Logs/scan/*.log
+            ./fastlane/test_output/**
diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - 8.0.0
     paths:
       - 'Sources/**'
       - 'Samples/iOS-Swift/**'

diff --git a/.gitignore b/.gitignore
@@ -77,3 +77,6 @@ Package.resolved
 
 # Visual Studio Code
 .vscode/
+
+Cartfile.resolved
+*.log
diff --git a/.sauce/config.yml b/.sauce/config.yml
@@ -42,11 +42,6 @@ suites:
     devices:
       - name: "iPhone.*"
         platformVersion: "11.4.1"
-
-  - name: "iOS-10"
-    devices:
-      - name: "iPhone.*"
-        platformVersion: "10.3.2"
 
 artifacts:
   download: