Skip to content

Commit

Permalink
Merge branch 'next' into BumpsnagAndroid6
Browse files Browse the repository at this point in the history
  • Loading branch information
richardelms authored May 31, 2024
2 parents 2ae6f24 + 1f70a41 commit 71cb0ca
Show file tree
Hide file tree
Showing 44 changed files with 689 additions and 690 deletions.
728 changes: 257 additions & 471 deletions .buildkite/pipeline.full.yml

Large diffs are not rendered by default.

98 changes: 51 additions & 47 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
aliases:
- &2021 "2021.3.36f1"

agents:
queue: macos-12-arm-unity
queue: macos-14

steps:
#
# Build notifier. We run tests for all Unity versions with the 2018 artifacts, as that is what we ship.
# Build notifier. We run tests for all Unity versions with the 2020 artifacts, as that is what we ship.
#
- label: Build released notifier artifact
timeout_in_minutes: 30
key: "build-artifacts"
env:
DEVELOPER_DIR: "/Applications/Xcode14.0.app"
UNITY_VERSION: "2018.4.36f1"
UNITY_VERSION: *2021
commands:
- bundle install
- bundle exec rake plugin:export
Expand All @@ -26,7 +28,7 @@ steps:
# agents:
# queue: windows-unity-wsl
# env:
# UNITY_VERSION: "2018.4.36f1"
# UNITY_VERSION: *2020
# WSLENV: UNITY_VERSION
# command:
# - /mnt/c/Windows/System32/cmd.exe /c .\\scripts\\ci-build-windows-plugin.bat
Expand All @@ -44,50 +46,48 @@ steps:
timeout_in_minutes: 10
depends_on: build-artifacts
env:
UNITY_VERSION: "2020.3.48f1"
DEVELOPER_DIR: "/Applications/Xcode14.0.app"
UNITY_VERSION: *2021
plugins:
'artifacts#v1.9.0':
download:
- Bugsnag.unitypackage
agents:
queue: macos-12-arm
commands:
features/scripts/do_size_test.sh

# Build Android test fixtures
- label: ":android: Build Android test fixture for Unity 2020"
- label: ":android: Build Android test fixture for Unity 2021"
timeout_in_minutes: 30
key: "build-android-fixture-2020"
key: "build-android-fixture-2021"
depends_on: "build-artifacts"
env:
UNITY_VERSION: "2020.3.48f1"
UNITY_VERSION: *2021
plugins:
artifacts#v1.5.0:
artifacts#v1.9.0:
download:
- Bugsnag.unitypackage
upload:
- features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk
- features/fixtures/maze_runner/mazerunner_2021.apk
- features/fixtures/build_android_apk.log
commands:
- bundle install
- rake test:android:build
retry:
automatic:
- exit_status: "*"
limit: 1

# - label: ':android: Build Android EDM test fixture for Unity 2020'
# - label: ':android: Build Android EDM test fixture for Unity 2021'
# timeout_in_minutes: 30
# key: 'build-edm-fixture-2020'
# key: 'build-edm-fixture-2021'
# depends_on: 'build-artifacts'
# env:
# UNITY_VERSION: "2020.3.48f1"
# UNITY_VERSION: *2021
# plugins:
# artifacts#v1.5.0:
# download:
# - Bugsnag.unitypackage
# upload:
# - features/fixtures/EDM_Fixture/edm_2020.3.48f1.apk
# - features/fixtures/EDM_Fixture/edm_2021.3.36f1.apk
# - features/scripts/buildEdmFixture.log
# - features/scripts/edmImport.log
# - features/scripts/enableEdm.log
Expand All @@ -101,17 +101,17 @@ steps:
#
# Run Android tests
#
- label: ":bitbar: :android: Run Android e2e tests for Unity 2020"
- label: ":bitbar: :android: Run Android e2e tests for Unity 2021"
timeout_in_minutes: 60
depends_on: "build-android-fixture-2020"
depends_on: "build-android-fixture-2021"
agents:
queue: opensource
env:
UNITY_VERSION: "2020.3.48f1"
UNITY_VERSION: *2021
plugins:
artifacts#v1.5.0:
download:
- "features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk"
- "features/fixtures/maze_runner/mazerunner_2021.apk"
upload:
- "maze_output/**/*"
- "maze_output/metrics.csv"
Expand All @@ -122,9 +122,10 @@ steps:
command:
- "features/csharp"
- "features/android"
- "--app=features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk"
- "--app=features/fixtures/maze_runner/mazerunner_2021.apk"
- "--farm=bb"
- "--device=ANDROID_9|ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13"
- "--appium-version=1.22"
- "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13"
- "--no-tunnel"
- "--aws-public-ip"
concurrency: 25
Expand All @@ -133,24 +134,24 @@ steps:

# Run Android EDM tests

# - label: ':android: Run Android EDM e2e tests for Unity 2020'
# - label: ':android: Run Android EDM e2e tests for Unity 2021'
# timeout_in_minutes: 30
# depends_on: 'build-edm-fixture-2020'
# depends_on: 'build-edm-fixture-2021'
# agents:
# queue: opensource
# env:
# UNITY_VERSION: "2020.3.48f1"
# UNITY_VERSION: "2021.3.36f1"
# plugins:
# artifacts#v1.5.0:
# download:
# - "features/fixtures/EDM_Fixture/edm_2020.3.48f1.apk"
# - "features/fixtures/EDM_Fixture/edm_2021.3.36f1.apk"
# upload:
# - "maze_output/**/*"
# docker-compose#v3.7.0:
# pull: maze-runner
# run: maze-runner
# command:
# - "--app=/app/features/fixtures/EDM_Fixture/edm_2020.3.48f1.apk"
# - "--app=/app/features/fixtures/EDM_Fixture/edm_2021.3.36f1.apk"
# - "--farm=bs"
# - "--device=ANDROID_11_0"
# - "features/edm"
Expand All @@ -161,44 +162,46 @@ steps:
#
# Build iOS test fixtures
#
- label: ":ios: Generate Xcode project - Unity 2020"
- label: ":ios: Generate Xcode project - Unity 2021"
timeout_in_minutes: 30
key: "generate-fixture-project-2020"
key: "generate-fixture-project-2021"
depends_on: "build-artifacts"
env:
UNITY_VERSION: "2020.3.48f1"
UNITY_VERSION: *2021
plugins:
artifacts#v1.5.0:
download:
- Bugsnag.unitypackage
upload:
- features/fixtures/unity.log
- project_2020.tgz
- project_2021.tgz
commands:
- bundle install
- rake test:ios:generate_xcode
- tar -zvcf project_2020.tgz features/fixtures/maze_runner/mazerunner_xcode
- tar -zvcf project_2021.tgz features/fixtures/maze_runner/mazerunner_xcode
retry:
automatic:
- exit_status: "*"
limit: 1

- label: ":ios: Build iOS test fixture for Unity 2020"
- label: ":ios: Build iOS test fixture for Unity 2021"
timeout_in_minutes: 30
key: "build-ios-fixture-2020"
depends_on: "generate-fixture-project-2020"
key: "build-ios-fixture-2021"
depends_on: "generate-fixture-project-2021"
env:
DEVELOPER_DIR: "/Applications/Xcode14.0.app"
UNITY_VERSION: "2020.3.48f1"
UNITY_VERSION: *2021
XCODE_VERSION: "15.3.0"
plugins:
artifacts#v1.5.0:
download:
- Bugsnag.unitypackage
- project_2020.tgz
- project_2021.tgz
upload:
- features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa
- features/fixtures/maze_runner/mazerunner_2021.ipa
- features/fixtures/unity.log
commands:
- tar -zxf project_2020.tgz features/fixtures/maze_runner
- bundle install
- tar -zxf project_2021.tgz features/fixtures/maze_runner
- rake test:ios:build_xcode
retry:
automatic:
Expand All @@ -208,15 +211,15 @@ steps:
#
# Run iOS tests
#
- label: ":bitbar: :ios: Run iOS e2e tests for Unity 2020"
- label: ":bitbar: :ios: Run iOS e2e tests for Unity 2021"
timeout_in_minutes: 60
depends_on: "build-ios-fixture-2020"
depends_on: "build-ios-fixture-2021"
agents:
queue: opensource
plugins:
artifacts#v1.5.0:
download:
- "features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa"
- "features/fixtures/maze_runner/mazerunner_2021.ipa"
upload:
- "maze_output/**/*"
- "maze_output/metrics.csv"
Expand All @@ -228,9 +231,10 @@ steps:
command:
- "features/csharp"
- "features/ios"
- "--app=features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa"
- "--app=features/fixtures/maze_runner/mazerunner_2021.ipa"
- "--farm=bb"
- "--device=IOS_12|IOS_13|IOS_14|IOS_15"
- "--appium-version=1.22"
- "--device=IOS_13|IOS_14|IOS_15"
- "--no-tunnel"
- "--aws-public-ip"
- "--fail-fast"
Expand Down
39 changes: 39 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,44 @@
# Changelog

## TBD ()

### Enhancements

- Added the `Bugsnag-Integrity` header to outgoing Bugsnag requests. [#797](https://github.com/bugsnag/bugsnag-unity/pull/797)

### Bug Fixes

- Added more null reference checking to the Bugsnag client to prevent crashes when accessing the client before it has been initialised [#788](https://github.com/bugsnag/bugsnag-unity/pull/788)

## 7.7.6 (2024-05-17)

- Fixed issue where meta files for the MacOS bundle were not generated. [#802](https://github.com/bugsnag/bugsnag-unity/pull/802)

## 7.7.5 (2024-05-02)

### Bug Fixes

- Fixed issue where changes to device.TotalMemory and device.ModelNumber in cocoa on send callbacks were not respected. [#793](https://github.com/bugsnag/bugsnag-unity/pull/793)

## 7.7.4 (2024-04-19)

### Bug Fixes

- Fixed issue where iOS C# events reported the incorrect value for device.osName. [#791](https://github.com/bugsnag/bugsnag-unity/pull/791)


## 7.7.3 (2024-04-11)

### Bug Fixes

- Changed initialisation of time api to reduce the risk of iOS app hangs on start [#783](https://github.com/bugsnag/bugsnag-unity/pull/783)
- Updated naming for BugsnagEditor EDM menu to reduce potential conflicts with other tools [#780](https://github.com/bugsnag/bugsnag-unity/pull/780)

## 7.7.2 (2024-03-01)

### Enhancements

- Improved handling of serialisation errors when flushing the event cache [#773](https://github.com/bugsnag/bugsnag-unity/pull/773)

## 7.7.1 (2024-01-25)

Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ source 'https://rubygems.org'
gem 'rake'
gem 'xcpretty'
gem 'xcodeproj'
gem 'cocoapods'
gem 'rake'

unless Gem.win_platform?
# Use official Maze Runner release
gem 'bugsnag-maze-runner', '~>8.0'
gem 'bugsnag-maze-runner', '~>9.0'

# Use a specific Maze Runner branch
# gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'master'
Expand Down
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ GEM
faye-websocket (~> 0.11.0)
selenium-webdriver (~> 4.2, < 4.6)
atomos (0.1.3)
bugsnag (6.26.0)
bugsnag (6.26.4)
concurrent-ruby (~> 1.0)
bugsnag-maze-runner (8.13.1)
bugsnag-maze-runner (9.6.0)
appium_lib (~> 12.0.0)
appium_lib_core (~> 5.4.0)
bugsnag (~> 6.24)
Expand All @@ -34,7 +34,7 @@ GEM
childprocess (4.1.0)
claide (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
cucumber (7.1.0)
builder (~> 3.2, >= 3.2.4)
cucumber-core (~> 10.1, >= 10.1.0)
Expand Down Expand Up @@ -67,7 +67,7 @@ GEM
cucumber-core (~> 10.1, >= 10.1.0)
cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
curb (0.9.11)
diff-lcs (1.5.0)
diff-lcs (1.5.1)
dogstatsd-ruby (5.5.0)
ecma-re-validator (0.4.0)
regexp_parser (~> 2.2)
Expand All @@ -83,20 +83,20 @@ GEM
regexp_parser (~> 2.0)
simpleidn (~> 0.2)
uri_template (~> 0.7)
mime-types (3.5.1)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1003)
mime-types-data (3.2024.0305)
multi_test (0.1.2)
nanaimo (0.3.0)
nokogiri (1.15.5-x86_64-darwin)
nokogiri (1.16.3-x86_64-darwin)
racc (~> 1.4)
optimist (3.0.1)
os (1.0.1)
power_assert (2.0.3)
racc (1.7.3)
rack (2.2.8)
rack (2.2.9)
rake (12.3.3)
regexp_parser (2.8.2)
regexp_parser (2.9.0)
rexml (3.2.6)
rouge (2.0.7)
rubyzip (2.3.2)
Expand Down Expand Up @@ -136,7 +136,7 @@ PLATFORMS
x86_64-darwin-20

DEPENDENCIES
bugsnag-maze-runner (~> 8.0)
bugsnag-maze-runner (~> 9.0)
rake
xcodeproj
xcpretty
Expand Down
Loading

0 comments on commit 71cb0ca

Please sign in to comment.