Skip to content

Commit d8b6498

Browse files
Merge pull request #1703 from bugsnag/release-v6.30.2
Release v6.30.2
2 parents b29cdab + ef7165b commit d8b6498

File tree

58 files changed

+3268
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3268
-445
lines changed

.buildkite/pipeline.full.yml

Lines changed: 271 additions & 11 deletions
Large diffs are not rendered by default.

.buildkite/pipeline.yml

Lines changed: 67 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ steps:
88
#
99

1010
- label: Static framework and Swift Package Manager builds
11+
key: framework_build
1112
timeout_in_minutes: 10
1213
agents:
1314
queue: macos-14
@@ -17,10 +18,10 @@ steps:
1718
- make build_xcframework
1819
- make build_swift
1920
- make build_ios_static
21+
- zip -ry Bugsnag.xcframework.zip build/xcframeworks/products/Bugsnag.xcframework
2022
plugins:
2123
- artifacts#v1.9.3:
22-
upload: "build/xcframeworks/products/Bugsnag.xcframework"
23-
compressed: xcframework.zip
24+
upload: "Bugsnag.xcframework.zip"
2425

2526
- label: Build test fixtures
2627
key: cocoa_fixture
@@ -205,6 +206,10 @@ steps:
205206
upload:
206207
- "macOSTestApp.log"
207208
- "maze_output/failed/**/*"
209+
test-collector#v1.10.2:
210+
files: "reports/TEST-*.xml"
211+
format: "junit"
212+
branch: "^master|next$$"
208213
commands:
209214
- bundle install
210215
- bundle exec maze-runner
@@ -224,6 +229,10 @@ steps:
224229
upload:
225230
- "macOSTestApp.log"
226231
- "maze_output/failed/**/*"
232+
test-collector#v1.10.2:
233+
files: "reports/TEST-*.xml"
234+
format: "junit"
235+
branch: "^master|next$$"
227236
commands:
228237
- bundle install
229238
- bundle exec maze-runner
@@ -243,6 +252,10 @@ steps:
243252
upload:
244253
- "macOSTestApp.log"
245254
- "maze_output/failed/**/*"
255+
test-collector#v1.10.2:
256+
files: "reports/TEST-*.xml"
257+
format: "junit"
258+
branch: "^master|next$$"
246259
commands:
247260
- bundle install
248261
- bundle exec maze-runner
@@ -280,6 +293,10 @@ steps:
280293
artifacts#v1.5.0:
281294
download: ["features/fixtures/macos/output/macOSTestApp_Release.zip"]
282295
upload: ["macOSTestApp.log", "maze_output/failed/**/*"]
296+
test-collector#v1.10.2:
297+
files: "reports/TEST-*.xml"
298+
format: "junit"
299+
branch: "^master|next$$"
283300
commands:
284301
- bundle install
285302
- bundle exec maze-runner
@@ -350,7 +367,7 @@ steps:
350367
#
351368
# BrowserStack
352369
#
353-
- label: ':browserstack: iOS 17 E2E tests batch 1'
370+
- label: ':browserstack: iOS 18 E2E tests batch 1'
354371
depends_on:
355372
- cocoa_fixture
356373
timeout_in_minutes: 60
@@ -367,12 +384,16 @@ steps:
367384
command:
368385
- "--app=@/app/build/ipa_url_bs_release.txt"
369386
- "--farm=bs"
370-
- "--device=IOS_17"
387+
- "--device=IOS_18"
371388
- "--appium-version=1.21.0"
372389
- "--a11y-locator"
373390
- "--fail-fast"
374391
- "features/release"
375392
- "--exclude=features/release/[e-z].*.feature$"
393+
test-collector#v1.10.2:
394+
files: "reports/TEST-*.xml"
395+
format: "junit"
396+
branch: "^master|next$$"
376397
concurrency: 25
377398
concurrency_group: 'browserstack-app'
378399
concurrency_method: eager
@@ -381,7 +402,7 @@ steps:
381402
- exit_status: -1 # Agent was lost
382403
limit: 2
383404

384-
- label: ':browserstack: iOS 17 E2E tests batch 2'
405+
- label: ':browserstack: iOS 18 E2E tests batch 2'
385406
depends_on:
386407
- cocoa_fixture
387408
timeout_in_minutes: 60
@@ -398,12 +419,16 @@ steps:
398419
command:
399420
- "--app=@/app/build/ipa_url_bs_release.txt"
400421
- "--farm=bs"
401-
- "--device=IOS_17"
422+
- "--device=IOS_18"
402423
- "--appium-version=1.21.0"
403424
- "--a11y-locator"
404425
- "--fail-fast"
405426
- "features/release"
406427
- "--exclude=features/release/[a-d].*.feature$"
428+
test-collector#v1.10.2:
429+
files: "reports/TEST-*.xml"
430+
format: "junit"
431+
branch: "^master|next$$"
407432
concurrency: 25
408433
concurrency_group: 'browserstack-app'
409434
concurrency_method: eager
@@ -413,7 +438,7 @@ steps:
413438
limit: 2
414439

415440
# PLAT-11155: App hang tests run on BrowserStack (Appium 1.x) for now
416-
- label: ':browserstack: iOS 17 app hang tests'
441+
- label: ':browserstack: iOS 18 app hang tests'
417442
depends_on:
418443
- cocoa_fixture
419444
timeout_in_minutes: 30
@@ -429,10 +454,14 @@ steps:
429454
command:
430455
- "--app=@build/ipa_url_bs_release.txt"
431456
- "--farm=bs"
432-
- "--device=IOS_17"
457+
- "--device=IOS_18"
433458
- "--appium-version=1.21.0"
434459
- "--fail-fast"
435460
- "features/app_hangs.feature"
461+
test-collector#v1.10.2:
462+
files: "reports/TEST-*.xml"
463+
format: "junit"
464+
branch: "^master|next$$"
436465
concurrency: 5
437466
concurrency_group: 'browserstack-app'
438467
concurrency_method: eager
@@ -474,6 +503,10 @@ steps:
474503
- "--aws-public-ip"
475504
- "--fail-fast"
476505
- "features/release/barebone_tests.feature"
506+
test-collector#v1.10.2:
507+
files: "reports/TEST-*.xml"
508+
format: "junit"
509+
branch: "^master|next$$"
477510
concurrency: 25
478511
concurrency_group: 'bitbar'
479512
concurrency_method: eager
@@ -504,6 +537,10 @@ steps:
504537
- "--aws-public-ip"
505538
- "--fail-fast"
506539
- "features/release/barebone_tests.feature"
540+
test-collector#v1.10.2:
541+
files: "reports/TEST-*.xml"
542+
format: "junit"
543+
branch: "^master|next$$"
507544
concurrency: 25
508545
concurrency_group: 'bitbar'
509546
concurrency_method: eager
@@ -534,6 +571,10 @@ steps:
534571
- "--aws-public-ip"
535572
- "--fail-fast"
536573
- "features/release/barebone_tests.feature"
574+
test-collector#v1.10.2:
575+
files: "reports/TEST-*.xml"
576+
format: "junit"
577+
branch: "^master|next$$"
537578
concurrency: 25
538579
concurrency_group: 'bitbar'
539580
concurrency_method: eager
@@ -564,6 +605,10 @@ steps:
564605
- "--aws-public-ip"
565606
- "--fail-fast"
566607
- "features/release/barebone_tests.feature"
608+
test-collector#v1.10.2:
609+
files: "reports/TEST-*.xml"
610+
format: "junit"
611+
branch: "^master|next$$"
567612
concurrency: 25
568613
concurrency_group: 'bitbar'
569614
concurrency_method: eager
@@ -577,7 +622,7 @@ steps:
577622
# Debug configration E2E tests
578623
#
579624

580-
- label: ':browserstack: iOS 17 debug configuration tests'
625+
- label: ':browserstack: iOS 18 debug configuration tests'
581626
depends_on:
582627
- cocoa_fixture
583628
timeout_in_minutes: 60
@@ -593,9 +638,13 @@ steps:
593638
command:
594639
- "--app=@/app/build/ipa_url_bs_debug.txt"
595640
- "--farm=bs"
596-
- "--device=IOS_17"
641+
- "--device=IOS_18"
597642
- "--fail-fast"
598643
- "features/debug"
644+
test-collector#v1.10.2:
645+
files: "reports/TEST-*.xml"
646+
format: "junit"
647+
branch: "^master|next$$"
599648
concurrency: 5
600649
concurrency_group: 'browserstack-app'
601650
concurrency_method: eager
@@ -626,6 +675,10 @@ steps:
626675
- "--aws-public-ip"
627676
- "--fail-fast"
628677
- "features/debug"
678+
test-collector#v1.10.2:
679+
files: "reports/TEST-*.xml"
680+
format: "junit"
681+
branch: "^master|next$$"
629682
concurrency: 25
630683
concurrency_group: 'bitbar'
631684
concurrency_method: eager
@@ -646,6 +699,10 @@ steps:
646699
upload:
647700
- "macOSTestApp.log"
648701
- "maze_output/failed/**/*"
702+
test-collector#v1.10.2:
703+
files: "reports/TEST-*.xml"
704+
format: "junit"
705+
branch: "^master|next$$"
649706
commands:
650707
- bundle install
651708
- bundle exec maze-runner

.github/workflows/downstream_updates.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
description: 'Version of the submodule to update downstream repos to'
1010
required: true
1111
type: string
12+
permissions: read-all
1213

1314
jobs:
1415
update-dependencies:
@@ -17,7 +18,7 @@ jobs:
1718
RELEASE_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.target_version || github.event.release.tag_name }}
1819
strategy:
1920
matrix:
20-
downstream_repo: ['bugsnag/bugsnag-unity', 'bugsnag/bugsnag-flutter']
21+
downstream_repo: ['bugsnag/bugsnag-unity', 'bugsnag/bugsnag-flutter', 'bugsnag/bugsnag-js', 'bugsnag/bugsnag-unreal']
2122
steps:
2223
- name: Install libcurl4-openssl-dev and net-tools
2324
run: |

.github/workflows/pull_request.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
name: "Pull Request"
22
on: [pull_request]
3+
permissions: read-all
34

45
jobs:
56

67
analyze:
8+
permissions:
9+
statuses: write
710
runs-on: macos-14
811
env:
912
# Infer 1.0.1 cannot parse the iOS 15 SDK headers
1013
DEVELOPER_DIR: /Applications/Xcode_15.4.app
1114
steps:
1215
- name: Checkout pull request HEAD
13-
uses: actions/checkout@v2
16+
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
1417
with:
1518
ref: ${{ github.event.pull_request.head.sha }}
1619
- name: Install dependencies
@@ -21,16 +24,19 @@ jobs:
2124
run: make oclint
2225

2326
danger:
27+
permissions:
28+
pull-requests: write
29+
statuses: write
2430
runs-on: macos-14
2531
steps:
2632
- name: Checkout target branch
27-
uses: actions/checkout@v2
33+
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
2834
with:
2935
ref: ${{ github.base_ref }}
3036
- name: Build framework
3137
run: xcodebuild -project Bugsnag.xcodeproj -configuration Release -target Bugsnag-iOS -destination generic/platform=iOS -quiet clean build VALID_ARCHS=arm64 RUN_CLANG_STATIC_ANALYZER=NO && mv build build.base
3238
- name: Checkout pull request merge branch
33-
uses: actions/checkout@v2
39+
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
3440
with:
3541
clean: false
3642
fetch-depth: 100

.github/workflows/update_docs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ name: "Update Docs"
22
on:
33
release:
44
types: [published]
5+
permissions: read-all
56

67
jobs:
78
build:
89
runs-on: macos-latest
910
steps:
1011
- name: Checkout bugsnag-cocoa
11-
uses: actions/checkout@v2
12+
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
1213

1314
- name: Checkout docs branch
14-
uses: actions/checkout@v2
15+
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
1516
with:
1617
ref: gh-pages
1718
path: docs

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ Package.resolved
3434
/oclint.json
3535
bb.ready
3636
/maze_output
37+
Gemfile.lock

.jazzy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ author_url: "https://www.bugsnag.com"
22
author: "Bugsnag Inc"
33
clean: false # avoid deleting docs/.git
44
framework_root: "Bugsnag"
5-
github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.30.1/Bugsnag"
5+
github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.30.2/Bugsnag"
66
github_url: "https://github.com/bugsnag/bugsnag-cocoa"
77
hide_documentation_coverage: true
88
module: "Bugsnag"
9-
module_version: "6.30.1"
9+
module_version: "6.30.2"
1010
objc: true
1111
output: "docs"
1212
readme: "README.md"

Bugsnag.podspec.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Bugsnag",
3-
"version": "6.30.1",
3+
"version": "6.30.2",
44
"summary": "The Bugsnag crash reporting framework for Apple platforms.",
55
"homepage": "https://bugsnag.com",
66
"license": "MIT",
@@ -9,7 +9,7 @@
99
},
1010
"source": {
1111
"git": "https://github.com/bugsnag/bugsnag-cocoa.git",
12-
"tag": "v6.30.1"
12+
"tag": "v6.30.2"
1313
},
1414
"ios": {
1515
"frameworks": [

Bugsnag/Helpers/BSGRunContext.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,10 @@ static void UpdateTaskMemory(void) {
460460
if (task_vm.limit_bytes_remaining) {
461461
setMemoryUsage(footprint, task_vm.limit_bytes_remaining);
462462
} else {
463-
#if !TARGET_OS_OSX
464-
if (@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macCatalyst 13.1, *)) {
463+
#if !TARGET_OS_OSX && !TARGET_OS_MACCATALYST
464+
// We disable access to os_proc_available_memory() entirely on Catalyst
465+
// because earlier versions are missing the API, causing linker errors on launch.
466+
if (@available(iOS 13.0, tvOS 13.0, watchOS 6.0, *)) {
465467
setMemoryUsage(footprint, os_proc_available_memory());
466468
}
467469
#endif

Bugsnag/Payload/BugsnagNotifier.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ - (instancetype)init {
2323
#else
2424
_name = @"Bugsnag Objective-C";
2525
#endif
26-
_version = @"6.30.1";
26+
_version = @"6.30.2";
2727
_url = @"https://github.com/bugsnag/bugsnag-cocoa";
2828
_dependencies = @[];
2929
}

0 commit comments

Comments
 (0)