Merge pull request #1533 from bugsnag/release-v6.26.0

Release v6.26.0
bugsnag · Mar 8, 2023 · b2c0cdf · b2c0cdf
2 parents b260ddb + db99e5e
commit b2c0cdf
Show file tree

Hide file tree

Showing 62 changed files with 815 additions and 484 deletions.
diff --git a/.buildkite/pipeline.bb.yml b/.buildkite/pipeline.bb.yml
@@ -0,0 +1,53 @@
+steps:
+
+  - label: 'BitBar Poc - iOS 15 - batch 1'
+    depends_on: "cocoa_fixture"
+    timeout_in_minutes: 90
+    agents:
+      queue: opensource
+    plugins:
+      artifacts#v1.9.0:
+        download: "features/fixtures/ios/output/iOSTestApp.ipa"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v4.7.0:
+        pull: cocoa-maze-runner-bitbar
+        run: cocoa-maze-runner-bitbar
+        service-ports: true
+        command:
+# TODO: Run in a single batch until PLAT-9603 is done
+#          - "--exclude=features/[e-z].*.feature$"
+          - "--app=/app/build/iOSTestApp.ipa"
+          - "--farm=bb"
+          - "--device=IOS_15"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+    concurrency: 5
+    concurrency_group: 'bitbar-ios-15'
+    concurrency_method: eager
+
+  - label: 'BitBar Poc - iOS 15 - batch 2'
+    # TODO: Run in a single batch until PLAT-9603 is done
+    skip: Pending PLAT-9603
+    depends_on: "cocoa_fixture"
+    timeout_in_minutes: 90
+    agents:
+      queue: opensource
+    plugins:
+      artifacts#v1.9.0:
+        download: "features/fixtures/ios/output/iOSTestApp.ipa"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v4.7.0:
+        pull: cocoa-maze-runner-bitbar
+        run: cocoa-maze-runner-bitbar
+        service-ports: true
+        command:
+          - "--exclude=features/[a-d].*.feature$"
+          - "--app=/app/build/iOSTestApp.ipa"
+          - "--farm=bb"
+          - "--device=IOS_15"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+    concurrency: 5
+    concurrency_group: 'bitbar-ios-15'
+    concurrency_method: eager
+
diff --git a/.buildkite/pipeline.bs.yml b/.buildkite/pipeline.bs.yml
@@ -0,0 +1,123 @@
+steps:
+
+  ##############################################################################
+  #
+  # Barebones E2E tests
+  #
+
+  - label: 'iOS 16 E2E tests batch 1'
+    depends_on:
+      - cocoa_fixture
+    timeout_in_minutes: 60
+    agents:
+      queue: opensource
+    plugins:
+      artifacts#v1.5.0:
+        download: "features/fixtures/ios/output/ipa_url.txt"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v3.7.0:
+        pull: cocoa-maze-runner
+        run: cocoa-maze-runner
+        command:
+          - "--app=@build/ipa_url.txt"
+          - "--farm=bs"
+          - "--device=IOS_16"
+          - "--appium-version=1.21.0"
+          - "--fail-fast"
+          - "--exclude=features/[e-z].*.feature$"
+          - "--order=random"
+    concurrency: 24
+    concurrency_group: browserstack-app
+    concurrency_method: eager
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+
+  - label: 'iOS 16 E2E tests batch 2'
+    depends_on:
+      - cocoa_fixture
+    timeout_in_minutes: 60
+    agents:
+      queue: opensource
+    plugins:
+      artifacts#v1.5.0:
+        download: "features/fixtures/ios/output/ipa_url.txt"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v3.7.0:
+        pull: cocoa-maze-runner
+        run: cocoa-maze-runner
+        command:
+          - "--app=@build/ipa_url.txt"
+          - "--farm=bs"
+          - "--device=IOS_16"
+          - "--appium-version=1.21.0"
+          - "--fail-fast"
+          - "--exclude=features/[a-d].*.feature$"
+          - "--order=random"
+    concurrency: 24
+    concurrency_group: browserstack-app
+    concurrency_method: eager
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+
+  - label: 'iOS 10 E2E tests batch 1'
+    depends_on:
+      - cocoa_fixture
+    timeout_in_minutes: 60
+    agents:
+      queue: opensource
+    plugins:
+      artifacts#v1.5.0:
+        download: "features/fixtures/ios/output/ipa_url.txt"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v3.7.0:
+        pull: cocoa-maze-runner-legacy
+        run: cocoa-maze-runner-legacy
+        command:
+          - "--app=@build/ipa_url.txt"
+          - "--farm=bs"
+          - "--device=IOS_10"
+          - "--appium-version=1.8.0"
+          - "--capabilities={\"browserstack.networkLogs\":\"true\"}"
+          - "--fail-fast"
+          - "--exclude=features/[e-z].*.feature$"
+          - "--order=random"
+    concurrency: 24
+    concurrency_group: browserstack-app
+    concurrency_method: eager
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+
+  - label: 'iOS 10 E2E tests batch 2'
+    depends_on:
+      - cocoa_fixture
+    timeout_in_minutes: 60
+    agents:
+      queue: opensource
+    plugins:
+      artifacts#v1.5.0:
+        download: "features/fixtures/ios/output/ipa_url.txt"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v3.7.0:
+        pull: cocoa-maze-runner-legacy
+        run: cocoa-maze-runner-legacy
+        command:
+          - "--app=@build/ipa_url.txt"
+          - "--farm=bs"
+          - "--device=IOS_10"
+          - "--appium-version=1.8.0"
+          - "--fail-fast"
+          - "--exclude=features/[a-d].*.feature$"
+          - "--order=random"
+    concurrency: 24
+    concurrency_group: browserstack-app
+    concurrency_method: eager
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml
@@ -73,13 +73,13 @@ steps:
       queue: opensource
     plugins:
       artifacts#v1.5.0:
-        download: ["features/fixtures/ios/output/iOSTestApp.ipa"]
+        download: "features/fixtures/ios/output/ipa_url.txt"
         upload: "maze_output/failed/**/*"
       docker-compose#v3.7.0:
         pull: cocoa-maze-runner
         run: cocoa-maze-runner
         command:
-          - "--app=/app/build/iOSTestApp.ipa"
+          - "--app=@build/ipa_url.txt"
           - "--farm=bs"
           - "--device=IOS_14"
           - "--appium-version=1.21.0"
@@ -102,13 +102,13 @@ steps:
       queue: opensource
     plugins:
       artifacts#v1.5.0:
-        download: ["features/fixtures/ios/output/iOSTestApp.ipa"]
+        download: "features/fixtures/ios/output/ipa_url.txt"
         upload: "maze_output/failed/**/*"
       docker-compose#v3.7.0:
         pull: cocoa-maze-runner
         run: cocoa-maze-runner
         command:
-          - "--app=/app/build/iOSTestApp.ipa"
+          - "--app=@build/ipa_url.txt"
           - "--farm=bs"
           - "--device=IOS_14"
           - "--appium-version=1.21.0"

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -201,128 +201,6 @@ steps:
     artifact_paths:
       - logs/*
 
-  ##############################################################################
-  #
-  # Barebones E2E tests
-  #
-
-  - label: 'iOS 16 E2E tests batch 1'
-    depends_on:
-      - cocoa_fixture
-    timeout_in_minutes: 60
-    agents:
-      queue: opensource
-    plugins:
-      artifacts#v1.5.0:
-        download: "features/fixtures/ios/output/ipa_url.txt"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v3.7.0:
-        pull: cocoa-maze-runner
-        run: cocoa-maze-runner
-        command:
-          - "--app=@build/ipa_url.txt"
-          - "--farm=bs"
-          - "--device=IOS_16"
-          - "--appium-version=1.21.0"
-          - "--fail-fast"
-          - "--exclude=features/[e-z].*.feature$"
-          - "--order=random"
-    concurrency: 24
-    concurrency_group: browserstack-app
-    concurrency_method: eager
-    retry:
-      automatic:
-        - exit_status: -1  # Agent was lost
-          limit: 2
-
-  - label: 'iOS 16 E2E tests batch 2'
-    depends_on:
-      - cocoa_fixture
-    timeout_in_minutes: 60
-    agents:
-      queue: opensource
-    plugins:
-      artifacts#v1.5.0:
-        download: "features/fixtures/ios/output/ipa_url.txt"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v3.7.0:
-        pull: cocoa-maze-runner
-        run: cocoa-maze-runner
-        command:
-          - "--app=@build/ipa_url.txt"
-          - "--farm=bs"
-          - "--device=IOS_16"
-          - "--appium-version=1.21.0"
-          - "--fail-fast"
-          - "--exclude=features/[a-d].*.feature$"
-          - "--order=random"
-    concurrency: 24
-    concurrency_group: browserstack-app
-    concurrency_method: eager
-    retry:
-      automatic:
-        - exit_status: -1  # Agent was lost
-          limit: 2
-
-  - label: 'iOS 10 E2E tests batch 1'
-    depends_on:
-      - cocoa_fixture
-    timeout_in_minutes: 60
-    agents:
-      queue: opensource
-    plugins:
-      artifacts#v1.5.0:
-        download: "features/fixtures/ios/output/ipa_url.txt"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v3.7.0:
-        pull: cocoa-maze-runner-legacy
-        run: cocoa-maze-runner-legacy
-        command:
-          - "--app=@build/ipa_url.txt"
-          - "--farm=bs"
-          - "--device=IOS_10"
-          - "--appium-version=1.8.0"
-          - "--capabilities={\"browserstack.networkLogs\":\"true\"}"
-          - "--fail-fast"
-          - "--exclude=features/[e-z].*.feature$"
-          - "--order=random"
-    concurrency: 24
-    concurrency_group: browserstack-app
-    concurrency_method: eager
-    retry:
-      automatic:
-        - exit_status: -1  # Agent was lost
-          limit: 2
-
-  - label: 'iOS 10 E2E tests batch 2'
-    depends_on:
-      - cocoa_fixture
-    timeout_in_minutes: 60
-    agents:
-      queue: opensource
-    plugins:
-      artifacts#v1.5.0:
-        download: "features/fixtures/ios/output/ipa_url.txt"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v3.7.0:
-        pull: cocoa-maze-runner-legacy
-        run: cocoa-maze-runner-legacy
-        command:
-          - "--app=@build/ipa_url.txt"
-          - "--farm=bs"
-          - "--device=IOS_10"
-          - "--appium-version=1.8.0"
-          - "--fail-fast"
-          - "--exclude=features/[a-d].*.feature$"
-          - "--order=random"
-    concurrency: 24
-    concurrency_group: browserstack-app
-    concurrency_method: eager
-    retry:
-      automatic:
-        - exit_status: -1  # Agent was lost
-          limit: 2
-
   - label: 'macOS 10.13 barebones E2E tests'
     depends_on:
       - cocoa_fixture

diff --git a/.buildkite/pipeline_trigger.sh b/.buildkite/pipeline_trigger.sh
@@ -10,3 +10,15 @@ else
   echo "Running basic build"
   buildkite-agent pipeline upload .buildkite/block.full.yml
 fi
+
+# Run BrowserStack steps unless instructed not to
+if [[ "$BUILDKITE_MESSAGE" != *"[nobs]"* &&
+      "$DEVICE_FARM" != *"NO_BS"* ]]; then
+  buildkite-agent pipeline upload .buildkite/pipeline.bs.yml
+fi
+
+# Run BitBar steps if instructed to
+if [[ "$BUILDKITE_MESSAGE" == *"[bb]"* ||
+      "$DEVICE_FARM" == *"BB"* ]]; then
+  buildkite-agent pipeline upload .buildkite/pipeline.bb.yml
+fi
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -14,11 +14,9 @@ jobs:
       with:
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Install dependencies
-      run: brew install infer oclint && gem install xcpretty
+      run: brew install oclint && gem install xcpretty
     - name: Build framework
       run: make compile_commands.json
-    - name: Infer
-      run: make infer
     - name: OCLint
       run: make oclint
 

diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -2,11 +2,11 @@ author_url: "https://www.bugsnag.com"
 author: "Bugsnag Inc"
 clean: false # avoid deleting docs/.git
 framework_root: "Bugsnag"
-github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.25.2/Bugsnag"
+github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.26.0/Bugsnag"
 github_url: "https://github.com/bugsnag/bugsnag-cocoa"
 hide_documentation_coverage: true
 module: "Bugsnag"
-module_version: "6.25.2"
+module_version: "6.26.0"
 objc: true
 output: "docs"
 readme: "README.md"

diff --git a/Bugsnag.podspec.json b/Bugsnag.podspec.json
@@ -1,6 +1,6 @@
 {
   "name": "Bugsnag",
-  "version": "6.25.2",
+  "version": "6.26.0",
   "summary": "The Bugsnag crash reporting framework for Apple platforms.",
   "homepage": "https://bugsnag.com",
   "license": "MIT",
@@ -9,7 +9,7 @@
   },
   "source": {
     "git": "https://github.com/bugsnag/bugsnag-cocoa.git",
-    "tag": "v6.25.2"
+    "tag": "v6.26.0"
   },
   "ios": {
     "frameworks": [