From d1b422a724af3d6fcd6b801587d304850f68d156 Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Tue, 9 Apr 2024 16:40:05 +0100 Subject: [PATCH 01/14] Drop testing on Unity 2018 and 2019 --- .buildkite/pipeline.full.yml | 529 +++-------------------------------- .buildkite/pipeline.yml | 78 +++--- 2 files changed, 72 insertions(+), 535 deletions(-) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index dd7def48e..55812200e 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -1,6 +1,4 @@ aliases: - - &2018 "2018.4.36f1" - - &2019 "2019.4.35f1" - &2020 "2020.3.48f1" - &2021 "2021.3.36f1" - &2022 "2022.3.22f1" @@ -10,59 +8,11 @@ agents: steps: # Note: - # The basic pipeline handles Unity 2020, but doesn't include the building of test fixtures for WebGL, macOS and + # The basic pipeline handles Unity 2021, but doesn't include the building of test fixtures for WebGL, macOS and # Windows. They are included here instead. # Build MacOS and WebGL test fixtures # - - label: Build Unity 2018 MacOS and WebGL test fixtures - timeout_in_minutes: 30 - key: "cocoa-webgl-2018-fixtures" - depends_on: "build-artifacts" - env: - DEVELOPER_DIR: "/Applications/Xcode14.0.app" - UNITY_VERSION: *2018 - # Python2 needed for WebGL to build - EMSDK_PYTHON: "/Library/Frameworks/Python.framework/Versions/2.7/bin/python" - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - commands: - - scripts/ci-build-macos-packages.sh - artifact_paths: - - unity.log - - features/fixtures/maze_runner/build/MacOS-2018.4.36f1.zip - - features/fixtures/maze_runner/build/WebGL-2018.4.36f1.zip - retry: - automatic: - - exit_status: "*" - limit: 1 - - - label: Build Unity 2019 MacOS and WebGL test fixtures - timeout_in_minutes: 30 - key: "cocoa-webgl-2019-fixtures" - depends_on: "build-artifacts" - env: - DEVELOPER_DIR: "/Applications/Xcode14.0.app" - UNITY_VERSION: *2019 - # Python2 needed for WebGL to build - EMSDK_PYTHON: "/Library/Frameworks/Python.framework/Versions/2.7/bin/python" - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - commands: - - scripts/ci-build-macos-packages.sh - artifact_paths: - - unity.log - - features/fixtures/maze_runner/build/MacOS-2019.4.35f1.zip - - features/fixtures/maze_runner/build/WebGL-2019.4.35f1.zip - retry: - automatic: - - exit_status: "*" - limit: 1 - - label: Build Unity 2020 MacOS and WebGL test fixtures timeout_in_minutes: 30 key: "cocoa-webgl-2020-fixtures" @@ -134,42 +84,6 @@ steps: # # Run macOS desktop tests # - - label: Run MacOS e2e tests for Unity 2018 - timeout_in_minutes: 60 - depends_on: "cocoa-webgl-2018-fixtures" - agents: - queue: macos-12-arm-unity - env: - UNITY_VERSION: *2018 - plugins: - artifacts#v1.5.0: - download: - - features/fixtures/maze_runner/build/MacOS-2018.4.36f1.zip - upload: - - maze_output/**/* - - '*-mazerunner.log' - - maze_output/metrics.csv - commands: - - scripts/ci-run-macos-tests-csharp.sh - - - label: Run MacOS e2e tests for Unity 2019 - timeout_in_minutes: 60 - depends_on: "cocoa-webgl-2019-fixtures" - agents: - queue: macos-12-arm-unity - env: - UNITY_VERSION: *2019 - plugins: - artifacts#v1.5.0: - download: - - features/fixtures/maze_runner/build/MacOS-2019.4.35f1.zip - upload: - - maze_output/**/* - - '*-mazerunner.log' - - maze_output/metrics.csv - commands: - - scripts/ci-run-macos-tests-csharp.sh - - label: Run MacOS e2e tests for Unity 2020 timeout_in_minutes: 60 depends_on: "cocoa-webgl-2020-fixtures" @@ -228,42 +142,6 @@ steps: # # Note: These are run on Intel due to an issue with persistence with Firefox on ARM. # - - label: Run WebGL e2e tests for Unity 2018 - timeout_in_minutes: 30 - depends_on: "cocoa-webgl-2018-fixtures" - agents: - queue: opensource-mac-cocoa-11 - env: - UNITY_VERSION: *2018 - plugins: - artifacts#v1.5.0: - download: - - features/fixtures/maze_runner/build/WebGL-2018.4.36f1.zip - upload: - - maze_output/**/* - - maze_output/metrics.csv - # TODO: WebGL persistence tests are currently skipped pending PLAT-8151 - commands: - - scripts/ci-run-webgl-tests.sh - - - label: Run WebGL e2e tests for Unity 2019 - timeout_in_minutes: 30 - depends_on: "cocoa-webgl-2019-fixtures" - agents: - queue: opensource-mac-cocoa-11 - env: - UNITY_VERSION: *2019 - plugins: - artifacts#v1.5.0: - download: - - features/fixtures/maze_runner/build/WebGL-2019.4.35f1.zip - upload: - - maze_output/**/* - - maze_output/metrics.csv - # TODO: WebGL persistence tests are currently skipped pending PLAT-8151 - commands: - - scripts/ci-run-webgl-tests.sh - - label: Run WebGL e2e tests for Unity 2020 timeout_in_minutes: 30 depends_on: "cocoa-webgl-2020-fixtures" @@ -317,60 +195,18 @@ steps: # # Build Android test fixtures # - - label: ":android: Build Android test fixture for Unity 2018" + - label: ":android: Build Android test fixture for Unity 2020" timeout_in_minutes: 30 - key: "build-android-fixture-2018" + key: "build-android-fixture-2020" depends_on: "build-artifacts" env: - UNITY_VERSION: *2018 - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - upload: - - features/fixtures/maze_runner/mazerunner_2018.4.36f1.apk - - features/fixtures/build_android_apk.log - commands: - - bundle install - - rake test:android:build - retry: - automatic: - - exit_status: "*" - limit: 1 - - - label: ":android: Build Android test fixture for Unity 2019" - timeout_in_minutes: 30 - key: "build-android-fixture-2019" - depends_on: "build-artifacts" - env: - UNITY_VERSION: *2019 - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - upload: - - features/fixtures/maze_runner/mazerunner_2019.4.35f1.apk - - features/fixtures/build_android_apk.log - commands: - - bundle install - - rake test:android:build - retry: - automatic: - - exit_status: "*" - limit: 1 - - - label: ":android: Build Android test fixture for Unity 2021" - timeout_in_minutes: 30 - key: "build-android-fixture-2021" - depends_on: "build-artifacts" - env: - UNITY_VERSION: *2021 + UNITY_VERSION: *2020 plugins: artifacts#v1.5.0: download: - Bugsnag.unitypackage upload: - - features/fixtures/maze_runner/mazerunner_2021.3.36f1.apk + - features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk - features/fixtures/build_android_apk.log commands: - bundle install @@ -401,18 +237,18 @@ steps: - exit_status: "*" limit: 1 - # - label: ':android: Build Android EDM test fixture for Unity 2021' + # - label: ':android: Build Android EDM test fixture for Unity 2020' # timeout_in_minutes: 30 - # key: 'build-edm-fixture-2021' + # key: 'build-edm-fixture-2020' # depends_on: 'build-artifacts' # env: - # UNITY_VERSION: *2021 + # UNITY_VERSION: *2020 # plugins: # artifacts#v1.5.0: # download: # - Bugsnag.unitypackage # upload: - # - features/fixtures/EDM_Fixture/edm_2021.3.36f1.apk + # - features/fixtures/EDM_Fixture/edm_2020.3.48f1.apk # - features/scripts/buildEdmFixture.log # - features/scripts/edmImport.log # - features/scripts/enableEdm.log @@ -426,81 +262,17 @@ steps: # # Run Android tests # - - label: ":bitbar: :android: Run Android e2e tests for Unity 2018" - timeout_in_minutes: 60 - depends_on: "build-android-fixture-2018" - agents: - queue: opensource - env: - UNITY_VERSION: *2018 - plugins: - artifacts#v1.5.0: - download: - - "features/fixtures/maze_runner/mazerunner_2018.4.36f1.apk" - upload: - - "maze_output/**/*" - - "maze_output/metrics.csv" - docker-compose#v4.7.0: - pull: maze-runner-bitbar - run: maze-runner-bitbar - service-ports: true - command: - - "features/csharp" - - "features/android" - - "--app=features/fixtures/maze_runner/mazerunner_2018.4.36f1.apk" - - "--farm=bb" - - "--appium-version=1.22" - - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13" - - "--no-tunnel" - - "--aws-public-ip" - - "--fail-fast" - concurrency: 25 - concurrency_group: "bitbar" - concurrency_method: eager - - - label: ":bitbar: :android: Run Android e2e tests for Unity 2019" + - label: ":bitbar: :android: Run Android e2e tests for Unity 2020" timeout_in_minutes: 60 - depends_on: "build-android-fixture-2019" + depends_on: "build-android-fixture-2020" agents: queue: opensource env: - UNITY_VERSION: *2019 - plugins: - artifacts#v1.5.0: - download: - - "features/fixtures/maze_runner/mazerunner_2019.4.35f1.apk" - upload: - - "maze_output/**/*" - - "maze_output/metrics.csv" - docker-compose#v4.7.0: - pull: maze-runner-bitbar - run: maze-runner-bitbar - service-ports: true - command: - - "features/csharp" - - "features/android" - - "--app=features/fixtures/maze_runner/mazerunner_2019.4.35f1.apk" - - "--farm=bb" - - "--appium-version=1.22" - - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13" - - "--no-tunnel" - - "--aws-public-ip" - - "--fail-fast" - concurrency: 25 - concurrency_group: "bitbar" - concurrency_method: eager - - - label: ":bitbar: :android: Run Android e2e tests for Unity 2021" - timeout_in_minutes: 60 - depends_on: "build-android-fixture-2021" - agents: - queue: opensource - env: - UNITY_VERSION: *2021 + UNITY_VERSION: *2020 plugins: artifacts#v1.5.0: download: - - "features/fixtures/maze_runner/mazerunner_2021.3.36f1.apk" + - "features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk" upload: - "maze_output/**/*" - "maze_output/metrics.csv" @@ -511,7 +283,7 @@ steps: command: - "features/csharp" - "features/android" - - "--app=features/fixtures/maze_runner/mazerunner_2021.3.36f1.apk" + - "--app=features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk" - "--farm=bb" - "--appium-version=1.22" - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13" @@ -554,9 +326,9 @@ steps: concurrency_group: "bitbar" concurrency_method: eager - # - label: ':android: Run Android EDM e2e tests for Unity 2021' + # - label: ':android: Run Android EDM e2e tests for Unity 2020' # timeout_in_minutes: 60 - # depends_on: 'build-edm-fixture-2021' + # depends_on: 'build-edm-fixture-2020' # agents: # queue: opensource # env: @@ -564,14 +336,14 @@ steps: # plugins: # artifacts#v1.5.0: # download: - # - "features/fixtures/EDM_Fixture/edm_2021.3.36f1.apk" + # - "features/fixtures/EDM_Fixture/edm_2020.3.48f1.apk" # upload: # - "maze_output/**/*" # docker-compose#v3.7.0: # pull: maze-runner # run: maze-runner # command: - # - "--app=/app/features/fixtures/EDM_Fixture/edm_2021.3.36f1.apk" + # - "--app=/app/features/fixtures/EDM_Fixture/edm_2020.3.48f1.apk" # - "--farm=bs" # - "--device=ANDROID_11_0" # - "features/edm" @@ -582,139 +354,44 @@ steps: # # Build iOS test fixtures # - - label: ":ios: Generate Xcode project - Unity 2018" - timeout_in_minutes: 30 - key: "generate-fixture-project-2018" - depends_on: "build-artifacts" - env: - UNITY_VERSION: *2018 - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - upload: - - features/fixtures/unity.log - - project_2018.tgz - commands: - - bundle install - - rake test:ios:generate_xcode - - tar -zvcf project_2018.tgz features/fixtures/maze_runner/mazerunner_xcode - retry: - automatic: - - exit_status: "*" - limit: 1 - - - label: ":ios: Build iOS test fixture for Unity 2018" - timeout_in_minutes: 30 - key: "build-ios-fixture-2018" - depends_on: "generate-fixture-project-2018" - agents: - queue: macos-12-arm-unity - env: - DEVELOPER_DIR: "/Applications/Xcode14.0.app" - UNITY_VERSION: *2018 - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - - project_2018.tgz - upload: - - features/fixtures/maze_runner/mazerunner_2018.4.36f1.ipa - - features/fixtures/unity.log - commands: - - bundle install - - tar -zxf project_2018.tgz features/fixtures/maze_runner - - rake test:ios:build_xcode - retry: - automatic: - - exit_status: "*" - limit: 1 - - - label: ":ios: Generate Xcode project - Unity 2019" - timeout_in_minutes: 30 - key: "generate-fixture-project-2019" - depends_on: "build-artifacts" - env: - UNITY_VERSION: *2019 - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - upload: - - features/fixtures/unity.log - - project_2019.tgz - commands: - - bundle install - - rake test:ios:generate_xcode - - tar -zvcf project_2019.tgz features/fixtures/maze_runner/mazerunner_xcode - retry: - automatic: - - exit_status: "*" - limit: 1 - - - label: ":ios: Build iOS test fixture for Unity 2019" - timeout_in_minutes: 30 - key: "build-ios-fixture-2019" - depends_on: "generate-fixture-project-2019" - agents: - queue: macos-14 - env: - UNITY_VERSION: *2019 - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - - project_2019.tgz - upload: - - features/fixtures/maze_runner/mazerunner_2019.4.35f1.ipa - - features/fixtures/unity.log - commands: - - bundle install - - tar -zxf project_2019.tgz features/fixtures/maze_runner - - rake test:ios:build_xcode - retry: - automatic: - - exit_status: "*" - limit: 1 - - - label: ":ios: Generate Xcode project - Unity 2021" + - label: ":ios: Generate Xcode project - Unity 2020" timeout_in_minutes: 30 - key: "generate-fixture-project-2021" + key: "generate-fixture-project-2020" depends_on: "build-artifacts" env: - UNITY_VERSION: *2021 + UNITY_VERSION: *2020 plugins: artifacts#v1.5.0: download: - Bugsnag.unitypackage upload: - features/fixtures/unity.log - - project_2021.tgz + - project_2020.tgz commands: - bundle install - rake test:ios:generate_xcode - - tar -zvcf project_2021.tgz features/fixtures/maze_runner/mazerunner_xcode + - tar -zvcf project_2020.tgz features/fixtures/maze_runner/mazerunner_xcode retry: automatic: - exit_status: "*" limit: 1 - - label: ":ios: Build iOS test fixture for Unity 2021" + - label: ":ios: Build iOS test fixture for Unity 2020" timeout_in_minutes: 30 - key: "build-ios-fixture-2021" - depends_on: "generate-fixture-project-2021" + key: "build-ios-fixture-2020" + depends_on: "generate-fixture-project-2020" agents: queue: macos-12-arm-unity env: DEVELOPER_DIR: "/Applications/Xcode14.0.app" - UNITY_VERSION: *2021 + UNITY_VERSION: *2020 plugins: artifacts#v1.5.0: download: - Bugsnag.unitypackage - - project_2021.tgz + - project_2020.tgz upload: - - features/fixtures/maze_runner/mazerunner_2021.3.36f1.ipa + - features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa - features/fixtures/unity.log commands: - bundle install @@ -776,47 +453,15 @@ steps: # # Run iOS tests # - - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2018" - timeout_in_minutes: 60 - depends_on: "build-ios-fixture-2018" - agents: - queue: opensource - env: - UNITY_VERSION: *2018 - plugins: - artifacts#v1.5.0: - download: - - "features/fixtures/maze_runner/mazerunner_2018.4.36f1.ipa" - upload: - - "maze_output/**/*" - - "maze_output/metrics.csv" - docker-compose#v4.7.0: - pull: maze-runner-bitbar - run: maze-runner-bitbar - service-ports: true - command: - - "features/csharp" - - "features/ios" - - "--app=features/fixtures/maze_runner/mazerunner_2018.4.36f1.ipa" - - "--farm=bb" - - "--appium-version=1.22" - - "--device=IOS_13|IOS_14|IOS_15" - - "--no-tunnel" - - "--aws-public-ip" - - "--fail-fast" - concurrency: 25 - concurrency_group: "bitbar" - concurrency_method: eager - - - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2019" + - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2020" timeout_in_minutes: 60 - depends_on: "build-ios-fixture-2019" + depends_on: "build-ios-fixture-2020" agents: queue: opensource plugins: artifacts#v1.5.0: download: - - "features/fixtures/maze_runner/mazerunner_2019.4.35f1.ipa" + - "features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa" upload: - "maze_output/**/*" - "maze_output/metrics.csv" @@ -827,37 +472,7 @@ steps: command: - "features/csharp" - "features/ios" - - "--app=features/fixtures/maze_runner/mazerunner_2019.4.35f1.ipa" - - "--farm=bb" - - "--appium-version=1.22" - - "--device=IOS_13|IOS_14|IOS_15" - - "--no-tunnel" - - "--aws-public-ip" - - "--fail-fast" - concurrency: 25 - concurrency_group: "bitbar" - concurrency_method: eager - - - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2021" - timeout_in_minutes: 60 - depends_on: "build-ios-fixture-2021" - agents: - queue: opensource - plugins: - artifacts#v1.5.0: - download: - - "features/fixtures/maze_runner/mazerunner_2021.3.36f1.ipa" - upload: - - "maze_output/**/*" - - "maze_output/metrics.csv" - docker-compose#v4.7.0: - pull: maze-runner-bitbar - run: maze-runner-bitbar - service-ports: true - command: - - "features/csharp" - - "features/ios" - - "--app=features/fixtures/maze_runner/mazerunner_2021.3.36f1.ipa" + - "--app=features/fixtures/maze_runner/mazerunner_2020.3.28f1.ipa" - "--farm=bb" - "--appium-version=1.22" - "--device=IOS_13|IOS_14|IOS_15" @@ -901,50 +516,6 @@ steps: # # Build Windows test fixtures # - - label: Build Unity 2018 Windows test fixture - timeout_in_minutes: 30 - key: "windows-2018-fixture" - depends_on: "build-artifacts" - agents: - queue: windows-unity-wsl - env: - UNITY_VERSION: *2018 - command: - - scripts/ci-build-windows-fixture-wsl.sh - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - upload: - - unity.log - - features/fixtures/maze_runner/build/Windows-2018.4.36f1.zip - retry: - automatic: - - exit_status: "*" - limit: 1 - - - label: Build Unity 2019 Windows test fixture - timeout_in_minutes: 30 - key: "windows-2019-fixture" - depends_on: "build-artifacts" - agents: - queue: windows-unity-wsl - env: - UNITY_VERSION: *2019 - command: - - scripts/ci-build-windows-fixture-wsl.sh - plugins: - artifacts#v1.5.0: - download: - - Bugsnag.unitypackage - upload: - - unity.log - - features/fixtures/maze_runner/build/Windows-2019.4.35f1.zip - retry: - automatic: - - exit_status: "*" - limit: 1 - - label: Build Unity 2020 Windows test fixture timeout_in_minutes: 30 key: "windows-2020-fixture" @@ -1014,40 +585,6 @@ steps: # # Run Windows e2e tests # - - label: Run Windows e2e tests for Unity 2018 - timeout_in_minutes: 30 - depends_on: "windows-2018-fixture" - agents: - queue: windows-general-wsl - env: - UNITY_VERSION: *2018 - plugins: - artifacts#v1.5.0: - download: - - features/fixtures/maze_runner/build/Windows-2018.4.36f1.zip - upload: - - maze_output/**/* - - maze_output/metrics.csv - commands: - - scripts/ci-run-windows-tests-wsl.sh - - - label: Run Windows e2e tests for Unity 2019 - timeout_in_minutes: 30 - depends_on: "windows-2019-fixture" - agents: - queue: windows-general-wsl - env: - UNITY_VERSION: *2019 - plugins: - artifacts#v1.5.0: - download: - - features/fixtures/maze_runner/build/Windows-2019.4.35f1.zip - upload: - - maze_output/**/* - - maze_output/metrics.csv - commands: - - scripts/ci-run-windows-tests-wsl.sh - - label: Run Windows e2e tests for Unity 2020 timeout_in_minutes: 30 depends_on: "windows-2020-fixture" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index f3cb32d9f..109627587 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,19 +1,19 @@ aliases: - - &2018 "2018.4.36f1" - &2020 "2020.3.48f1" + - &2021 "2021.3.36f1" agents: 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: - UNITY_VERSION: *2018 + UNITY_VERSION: *2020 commands: - bundle install - bundle exec rake plugin:export @@ -29,7 +29,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 @@ -47,7 +47,7 @@ steps: timeout_in_minutes: 10 depends_on: build-artifacts env: - UNITY_VERSION: *2020 + UNITY_VERSION: *2021 plugins: 'artifacts#v1.9.0': download: @@ -56,18 +56,18 @@ steps: 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 + UNITY_VERSION: *2021 plugins: artifacts#v1.5.0: download: - Bugsnag.unitypackage upload: - - features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk + - features/fixtures/maze_runner/mazerunner_2021.3.36f1.apk - features/fixtures/build_android_apk.log commands: - bundle install @@ -77,18 +77,18 @@ steps: - 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 @@ -102,17 +102,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 + UNITY_VERSION: *2021 plugins: artifacts#v1.5.0: download: - - "features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk" + - "features/fixtures/maze_runner/mazerunner_2021.3.36f1.apk" upload: - "maze_output/**/*" - "maze_output/metrics.csv" @@ -123,7 +123,7 @@ steps: command: - "features/csharp" - "features/android" - - "--app=features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk" + - "--app=features/fixtures/maze_runner/mazerunner_2021.3.36f1.apk" - "--farm=bb" - "--appium-version=1.22" - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13" @@ -136,24 +136,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" @@ -164,45 +164,45 @@ 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 + 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: - UNITY_VERSION: *2020 + UNITY_VERSION: *2021 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.3.36f1.ipa - features/fixtures/unity.log commands: - bundle install - - tar -zxf project_2020.tgz features/fixtures/maze_runner + - tar -zxf project_2021.tgz features/fixtures/maze_runner - rake test:ios:build_xcode retry: automatic: @@ -212,15 +212,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.3.36f1.ipa" upload: - "maze_output/**/*" - "maze_output/metrics.csv" @@ -232,7 +232,7 @@ steps: command: - "features/csharp" - "features/ios" - - "--app=features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa" + - "--app=features/fixtures/maze_runner/mazerunner_2021.3.36f1.ipa" - "--farm=bb" - "--appium-version=1.22" - "--device=IOS_13|IOS_14|IOS_15" From 1be7ffa55f3c2cb3bfb43b7368a9eb27a7fe6a0f Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Wed, 10 Apr 2024 14:19:37 +0100 Subject: [PATCH 02/14] Move steps to macOS 14 [full ci] --- .buildkite/pipeline.full.yml | 22 +++++++--------------- .buildkite/pipeline.yml | 1 + 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index 55812200e..3af5bb6d6 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -4,7 +4,7 @@ aliases: - &2022 "2022.3.22f1" agents: - queue: macos-12-arm-unity + queue: macos-14 steps: # Note: @@ -18,8 +18,8 @@ steps: key: "cocoa-webgl-2020-fixtures" depends_on: "build-artifacts" env: - DEVELOPER_DIR: "/Applications/Xcode14.0.app" UNITY_VERSION: *2020 + XCODE_VERSION: "15.3.0" # Python2 needed for WebGL to build EMSDK_PYTHON: "/Library/Frameworks/Python.framework/Versions/2.7/bin/python" plugins: @@ -42,8 +42,8 @@ steps: key: "cocoa-webgl-2021-fixtures" depends_on: "build-artifacts" env: - DEVELOPER_DIR: "/Applications/Xcode14.0.app" UNITY_VERSION: *2021 + XCODE_VERSION: "15.3.0" plugins: artifacts#v1.5.0: download: @@ -64,8 +64,8 @@ steps: key: "cocoa-webgl-2022-fixtures" depends_on: "build-artifacts" env: - DEVELOPER_DIR: "/Applications/Xcode14.0.app" UNITY_VERSION: *2022 + XCODE_VERSION: "15.3.0" plugins: artifacts#v1.5.0: download: @@ -87,8 +87,6 @@ steps: - label: Run MacOS e2e tests for Unity 2020 timeout_in_minutes: 60 depends_on: "cocoa-webgl-2020-fixtures" - agents: - queue: macos-12-arm-unity env: UNITY_VERSION: *2020 plugins: @@ -123,8 +121,6 @@ steps: - label: Run MacOS e2e tests for Unity 2022 timeout_in_minutes: 60 depends_on: 'cocoa-webgl-2022-fixtures' - agents: - queue: macos-12-arm-unity env: UNITY_VERSION: *2022 plugins: @@ -380,10 +376,8 @@ steps: timeout_in_minutes: 30 key: "build-ios-fixture-2020" depends_on: "generate-fixture-project-2020" - agents: - queue: macos-12-arm-unity env: - DEVELOPER_DIR: "/Applications/Xcode14.0.app" + XCODE_VERSION: "15.3.0" UNITY_VERSION: *2020 plugins: artifacts#v1.5.0: @@ -395,7 +389,7 @@ steps: - features/fixtures/unity.log commands: - bundle install - - tar -zxf project_2021.tgz features/fixtures/maze_runner + - tar -zxf project_2020.tgz features/fixtures/maze_runner - rake test:ios:build_xcode retry: automatic: @@ -428,11 +422,9 @@ steps: timeout_in_minutes: 30 key: "build-ios-fixture-2022" depends_on: "generate-fixture-project-2022" - agents: - queue: macos-12-arm-unity env: - DEVELOPER_DIR: "/Applications/Xcode14.0.app" UNITY_VERSION: *2022 + XCODE_VERSION: "15.3.0" plugins: artifacts#v1.5.0: download: diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 109627587..fa1581396 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -192,6 +192,7 @@ steps: depends_on: "generate-fixture-project-2021" env: UNITY_VERSION: *2021 + XCODE_VERSION: "15.3.0" plugins: artifacts#v1.5.0: download: From a326b57386012608ede91c9fa9dfac84fc1ecf93 Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Wed, 10 Apr 2024 16:30:51 +0100 Subject: [PATCH 03/14] Corrections [full ci] --- .buildkite/pipeline.full.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index 3af5bb6d6..9476a1ad1 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -87,6 +87,8 @@ steps: - label: Run MacOS e2e tests for Unity 2020 timeout_in_minutes: 60 depends_on: "cocoa-webgl-2020-fixtures" + agents: + queue: macos-12-arm env: UNITY_VERSION: *2020 plugins: @@ -121,6 +123,8 @@ steps: - label: Run MacOS e2e tests for Unity 2022 timeout_in_minutes: 60 depends_on: 'cocoa-webgl-2022-fixtures' + agents: + queue: macos-12-arm env: UNITY_VERSION: *2022 plugins: @@ -176,6 +180,8 @@ steps: - label: Run WebGL e2e tests for Unity 2022 timeout_in_minutes: 30 depends_on: 'cocoa-webgl-2022-fixtures' + agents: + queue: opensource-mac-cocoa-11 env: UNITY_VERSION: *2022 plugins: @@ -464,7 +470,7 @@ steps: command: - "features/csharp" - "features/ios" - - "--app=features/fixtures/maze_runner/mazerunner_2020.3.28f1.ipa" + - "--app=features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa" - "--farm=bb" - "--appium-version=1.22" - "--device=IOS_13|IOS_14|IOS_15" From e29e9f315ae1e4d38659095bc78a5777646f754d Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Thu, 11 Apr 2024 09:07:17 +0100 Subject: [PATCH 04/14] Build artefact with 2021 [full ci] --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index fa1581396..4845fbbbc 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -13,7 +13,7 @@ steps: timeout_in_minutes: 30 key: "build-artifacts" env: - UNITY_VERSION: *2020 + UNITY_VERSION: *2021 commands: - bundle install - bundle exec rake plugin:export From 9768487b018c35c0a4a4964bd41076ad0cee56be Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Fri, 12 Apr 2024 00:03:06 +0100 Subject: [PATCH 05/14] Add tests on Unity 2023 [full ci] --- .buildkite/pipeline.full.yml | 205 +++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index 9476a1ad1..779fc2e80 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -2,6 +2,8 @@ aliases: - &2020 "2020.3.48f1" - &2021 "2021.3.36f1" - &2022 "2022.3.22f1" + - &2023 "2023.2.17f1" + agents: queue: macos-14 @@ -81,6 +83,28 @@ steps: - exit_status: "*" limit: 1 + - label: Build Unity 2023 MacOS and WebGL test fixtures + timeout_in_minutes: 30 + key: "cocoa-webgl-2023-fixtures" + depends_on: "build-artifacts" + env: + UNITY_VERSION: *2023 + XCODE_VERSION: "15.3.0" + plugins: + artifacts#v1.5.0: + download: + - Bugsnag.unitypackage + commands: + - scripts/ci-build-macos-packages.sh + artifact_paths: + - unity.log + - features/fixtures/maze_runner/build/MacOS-2023.2.17f1.zip + - features/fixtures/maze_runner/build/WebGL-2023.2.17f1.zip + retry: + automatic: + - exit_status: "*" + limit: 1 + # # Run macOS desktop tests # @@ -137,6 +161,23 @@ steps: commands: - scripts/ci-run-macos-tests-csharp.sh + - label: Run MacOS e2e tests for Unity 2023 + timeout_in_minutes: 60 + depends_on: 'cocoa-webgl-2023-fixtures' + agents: + queue: macos-12-arm + env: + UNITY_VERSION: *2023 + plugins: + artifacts#v1.5.0: + download: + - features/fixtures/maze_runner/build/MacOS-2023.2.17f1.zip + upload: + - maze_output/**/* + - '*-mazerunner.log' + commands: + - scripts/ci-run-macos-tests-csharp.sh + # # Run WebGL tests # @@ -194,6 +235,23 @@ steps: commands: - scripts/ci-run-webgl-tests.sh + - label: Run WebGL e2e tests for Unity 2023 + timeout_in_minutes: 30 + depends_on: 'cocoa-webgl-2023-fixtures' + agents: + queue: opensource-mac-cocoa-11 + env: + UNITY_VERSION: *2023 + plugins: + artifacts#v1.5.0: + download: + - features/fixtures/maze_runner/build/WebGL-2023.2.17f1.zip + upload: + - maze_output/**/* + # TODO: WebGL persistence tests are currently skipped pending PLAT-8151 + commands: + - scripts/ci-run-webgl-tests.sh + # # Build Android test fixtures # @@ -328,6 +386,38 @@ steps: concurrency_group: "bitbar" concurrency_method: eager + - label: ":bitbar: :android: Run Android e2e tests for Unity 2023" + timeout_in_minutes: 60 + depends_on: "build-android-fixture-2023" + agents: + queue: opensource + env: + UNITY_VERSION: *2023 + plugins: + artifacts#v1.5.0: + download: + - "features/fixtures/maze_runner/mazerunner_2023.3.22f1.apk" + upload: + - "maze_output/**/*" + - "maze_output/metrics.csv" + docker-compose#v4.7.0: + pull: maze-runner-bitbar + run: maze-runner-bitbar + service-ports: true + command: + - "features/csharp" + - "features/android" + - "--app=features/fixtures/maze_runner/mazerunner_2023.3.22f1.apk" + - "--farm=bb" + - "--appium-version=1.22" + - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13" + - "--no-tunnel" + - "--aws-public-ip" + - "--fail-fast" + concurrency: 25 + concurrency_group: "bitbar" + concurrency_method: eager + # - label: ':android: Run Android EDM e2e tests for Unity 2020' # timeout_in_minutes: 60 # depends_on: 'build-edm-fixture-2020' @@ -448,6 +538,52 @@ steps: - exit_status: "*" limit: 1 + - label: ":ios: Generate Xcode project - Unity 2023" + timeout_in_minutes: 30 + key: "generate-fixture-project-2023" + depends_on: "build-artifacts" + env: + UNITY_VERSION: *2023 + plugins: + artifacts#v1.5.0: + download: + - Bugsnag.unitypackage + upload: + - features/fixtures/unity.log + - project_2023.tgz + commands: + - bundle install + - rake test:ios:generate_xcode + - tar -zvcf project_2023.tgz features/fixtures/maze_runner/mazerunner_xcode + retry: + automatic: + - exit_status: "*" + limit: 1 + + - label: ":ios: Build iOS test fixture for Unity 2023" + timeout_in_minutes: 30 + key: "build-ios-fixture-2023" + depends_on: "generate-fixture-project-2023" + env: + UNITY_VERSION: *2023 + XCODE_VERSION: "15.3.0" + plugins: + artifacts#v1.5.0: + download: + - Bugsnag.unitypackage + - project_2023.tgz + upload: + - features/fixtures/maze_runner/mazerunner_2023.3.22f1.ipa + - features/fixtures/unity.log + commands: + - bundle install + - tar -zxf project_2023.tgz features/fixtures/maze_runner + - rake test:ios:build_xcode + retry: + automatic: + - exit_status: "*" + limit: 1 + # # Run iOS tests # @@ -511,6 +647,36 @@ steps: concurrency_group: "bitbar" concurrency_method: eager + - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2023" + timeout_in_minutes: 60 + depends_on: "build-ios-fixture-2023" + agents: + queue: opensource + plugins: + artifacts#v1.5.0: + download: + - "features/fixtures/maze_runner/mazerunner_2023.3.22f1.ipa" + upload: + - "maze_output/**/*" + - "maze_output/metrics.csv" + docker-compose#v4.7.0: + pull: maze-runner-bitbar + run: maze-runner-bitbar + service-ports: true + command: + - "features/csharp" + - "features/ios" + - "--app=features/fixtures/maze_runner/mazerunner_2023.3.22f1.ipa" + - "--farm=bb" + - "--appium-version=1.22" + - "--device=IOS_13|IOS_14|IOS_15" + - "--no-tunnel" + - "--aws-public-ip" + - "--fail-fast" + concurrency: 25 + concurrency_group: "bitbar" + concurrency_method: eager + # # Build Windows test fixtures # @@ -580,6 +746,28 @@ steps: - exit_status: "*" limit: 1 + - label: Build Unity 2023 Windows test fixture + timeout_in_minutes: 30 + key: "windows-2023-fixture" + depends_on: "build-artifacts" + agents: + queue: windows-unity-wsl + env: + UNITY_VERSION: "2023.2.15f1" + commands: + - scripts/ci-build-windows-fixture-wsl.sh + plugins: + artifacts#v1.5.0: + download: + - Bugsnag.unitypackage + upload: + - unity.log + - features/fixtures/maze_runner/build/Windows-2023.2.15f1.zip + retry: + automatic: + - exit_status: "*" + limit: 1 + # # Run Windows e2e tests # @@ -634,3 +822,20 @@ steps: - maze_output/metrics.csv commands: - scripts/ci-run-windows-tests-wsl.sh + + - label: Run Windows e2e tests for Unity 2023 + timeout_in_minutes: 30 + depends_on: "windows-2023-fixture" + agents: + queue: windows-general-wsl + env: + UNITY_VERSION: "2023.2.15f1" + plugins: + artifacts#v1.5.0: + download: + - features/fixtures/maze_runner/build/Windows-2023.2.15f1.zip + upload: + - maze_output/**/* + - maze_output/metrics.csv + commands: + - scripts/ci-run-windows-tests-wsl.sh From 8f38477045ea73f14373c30f72f4d62df61d98ec Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Fri, 12 Apr 2024 08:34:41 +0100 Subject: [PATCH 06/14] Corrections [full ci] --- .buildkite/pipeline.full.yml | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index 779fc2e80..a0a0232dd 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -297,6 +297,27 @@ steps: - exit_status: "*" limit: 1 + - label: ":android: Build Android test fixture for Unity 2023" + timeout_in_minutes: 30 + key: "build-android-fixture-2023" + depends_on: "build-artifacts" + env: + UNITY_VERSION: *2023 + plugins: + artifacts#v1.5.0: + download: + - Bugsnag.unitypackage + upload: + - features/fixtures/maze_runner/mazerunner_2022.2.17f1.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' # timeout_in_minutes: 30 # key: 'build-edm-fixture-2020' @@ -396,7 +417,7 @@ steps: plugins: artifacts#v1.5.0: download: - - "features/fixtures/maze_runner/mazerunner_2023.3.22f1.apk" + - "features/fixtures/maze_runner/mazerunner_2023.2.17f1.apk" upload: - "maze_output/**/*" - "maze_output/metrics.csv" @@ -407,7 +428,7 @@ steps: command: - "features/csharp" - "features/android" - - "--app=features/fixtures/maze_runner/mazerunner_2023.3.22f1.apk" + - "--app=features/fixtures/maze_runner/mazerunner_2023.2.17f1.apk" - "--farm=bb" - "--appium-version=1.22" - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13" @@ -573,7 +594,7 @@ steps: - Bugsnag.unitypackage - project_2023.tgz upload: - - features/fixtures/maze_runner/mazerunner_2023.3.22f1.ipa + - features/fixtures/maze_runner/mazerunner_2023.2.17f1.ipa - features/fixtures/unity.log commands: - bundle install @@ -655,7 +676,7 @@ steps: plugins: artifacts#v1.5.0: download: - - "features/fixtures/maze_runner/mazerunner_2023.3.22f1.ipa" + - "features/fixtures/maze_runner/mazerunner_2023.2.17f1.ipa" upload: - "maze_output/**/*" - "maze_output/metrics.csv" @@ -666,7 +687,7 @@ steps: command: - "features/csharp" - "features/ios" - - "--app=features/fixtures/maze_runner/mazerunner_2023.3.22f1.ipa" + - "--app=features/fixtures/maze_runner/mazerunner_2023.2.17f1.ipa" - "--farm=bb" - "--appium-version=1.22" - "--device=IOS_13|IOS_14|IOS_15" From 31855afd07c9d7497e2f8970f24f9059c1ef2f30 Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Mon, 15 Apr 2024 10:22:53 +0100 Subject: [PATCH 07/14] Corrections 2 [full ci] --- .buildkite/pipeline.full.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index a0a0232dd..9ec8bfa08 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -308,7 +308,7 @@ steps: download: - Bugsnag.unitypackage upload: - - features/fixtures/maze_runner/mazerunner_2022.2.17f1.apk + - features/fixtures/maze_runner/mazerunner_2023.2.17f1.apk - features/fixtures/build_android_apk.log commands: - bundle install @@ -774,7 +774,7 @@ steps: agents: queue: windows-unity-wsl env: - UNITY_VERSION: "2023.2.15f1" + UNITY_VERSION: *2023 commands: - scripts/ci-build-windows-fixture-wsl.sh plugins: @@ -783,7 +783,7 @@ steps: - Bugsnag.unitypackage upload: - unity.log - - features/fixtures/maze_runner/build/Windows-2023.2.15f1.zip + - features/fixtures/maze_runner/build/Windows-2023.2.17f1.zip retry: automatic: - exit_status: "*" From 708caea54c8466c5b8dfdab32f26fe97583b639f Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Fri, 19 Apr 2024 12:27:54 +0100 Subject: [PATCH 08/14] Upload import log --- .buildkite/pipeline.full.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index 9ec8bfa08..c8e085e39 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -739,6 +739,7 @@ steps: - Bugsnag.unitypackage upload: - unity.log + - unity_import.log - features/fixtures/maze_runner/build/Windows-2021.3.36f1.zip retry: automatic: @@ -761,6 +762,7 @@ steps: - Bugsnag.unitypackage upload: - unity.log + - unity_import.log - features/fixtures/maze_runner/build/Windows-2022.3.22f1.zip retry: automatic: @@ -783,6 +785,7 @@ steps: - Bugsnag.unitypackage upload: - unity.log + - unity_import.log - features/fixtures/maze_runner/build/Windows-2023.2.17f1.zip retry: automatic: From af0c0a64c80422cff33ca10b5b06dc3f538eee5c Mon Sep 17 00:00:00 2001 From: Richard Elms Date: Tue, 23 Apr 2024 10:57:17 +0200 Subject: [PATCH 09/14] PLAT-12022 missing cocoa callback values (#793) --- CHANGELOG.md | 6 ++++++ .../Scripts/Scenarios/iOS/IosNativeOnSendCallback.cs | 4 +++- features/ios/ios_callbacks.feature | 4 ++++ src/BugsnagUnity/Native/Cocoa/NativeDevice.cs | 8 ++++---- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 772dcb88d..881b2fcf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## TBD + +### 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-05-19) ### Bug Fixes diff --git a/features/fixtures/maze_runner/Assets/Scripts/Scenarios/iOS/IosNativeOnSendCallback.cs b/features/fixtures/maze_runner/Assets/Scripts/Scenarios/iOS/IosNativeOnSendCallback.cs index d87a73613..5445f389d 100644 --- a/features/fixtures/maze_runner/Assets/Scripts/Scenarios/iOS/IosNativeOnSendCallback.cs +++ b/features/fixtures/maze_runner/Assets/Scripts/Scenarios/iOS/IosNativeOnSendCallback.cs @@ -40,7 +40,9 @@ public override void PrepareConfig(string apiKey, string host) device.Jailbroken = true; device.Orientation = "Custom Orientation"; device.Time = new DateTimeOffset(1985, 08, 21, 01, 01, 01, TimeSpan.Zero); - + device.TotalMemory = 999; + device.ModelNumber = "Custom ModelNumber"; + // breadcrumbs foreach (var crumb in @event.Breadcrumbs) { diff --git a/features/ios/ios_callbacks.feature b/features/ios/ios_callbacks.feature index a6332e03f..ebc6122e2 100644 --- a/features/ios/ios_callbacks.feature +++ b/features/ios/ios_callbacks.feature @@ -50,6 +50,10 @@ Feature: Callbacks And the event "device.osVersion" equals "Custom OsVersion" And the event "device.runtimeVersions.scoop" equals "dewoop" And the event "device.orientation" equals "Custom Orientation" + And the event "device.modelNumber" equals "Custom ModelNumber" + And the event "device.totalMemory" equals 999 + + # Breadcrumbs And the event "breadcrumbs.0.name" equals "Custom Message" diff --git a/src/BugsnagUnity/Native/Cocoa/NativeDevice.cs b/src/BugsnagUnity/Native/Cocoa/NativeDevice.cs index 9848669ce..aac369c67 100644 --- a/src/BugsnagUnity/Native/Cocoa/NativeDevice.cs +++ b/src/BugsnagUnity/Native/Cocoa/NativeDevice.cs @@ -14,6 +14,8 @@ public class NativeDevice : IDevice private const string MODEL_KEY = "model"; private const string OS_NAME_KEY = "osName"; private const string OS_VERSION_KEY = "osVersion"; + private const string MODEL_NUMBER_KEY = "modelNumber"; + private const string TOTAL_MEMORY_KEY = "totalMemory"; internal NativePayloadClassWrapper NativeWrapper; @@ -25,11 +27,9 @@ public NativeDevice(IntPtr nativeDevice) public string BrowserName { get; set; } public string BrowserVersion { get; set; } public string[] CpuAbi { get; set; } - public long? TotalMemory { get; set; } + public long? TotalMemory {get => NativeWrapper.GetNativeLong(TOTAL_MEMORY_KEY); set => NativeWrapper.SetNativeLong(TOTAL_MEMORY_KEY, value); } public string UserAgent { get; set; } - public string ModelNumber { get; set; } - - + public string ModelNumber { get => NativeWrapper.GetNativeString(MODEL_NUMBER_KEY); set => NativeWrapper.SetNativeString(MODEL_NUMBER_KEY,value); } public string Id { get => NativeWrapper.GetNativeString(ID_KEY); set => NativeWrapper.SetNativeString(ID_KEY,value); } public bool? Jailbroken { get => NativeWrapper.GetNativeBool(JAIL_BROKEN_KEY); set => NativeWrapper.SetNativeBool(JAIL_BROKEN_KEY, value); } From 9d8f31d7cb92aa20804a30f92127445b1396fed8 Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Fri, 26 Apr 2024 14:58:43 +0100 Subject: [PATCH 10/14] Move all tests running on MacOS 12 to MacOS 14 (#794) --- .buildkite/pipeline.full.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index 7db7b9d58..af92bd960 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -88,7 +88,7 @@ steps: timeout_in_minutes: 60 depends_on: "cocoa-webgl-2020-fixtures" agents: - queue: macos-12-arm + queue: macos-14 env: UNITY_VERSION: *2020 plugins: @@ -124,7 +124,7 @@ steps: timeout_in_minutes: 60 depends_on: 'cocoa-webgl-2022-fixtures' agents: - queue: macos-12-arm + queue: macos-14 env: UNITY_VERSION: *2022 plugins: From d0b622b9f9a7d1dde16bff7f41e66ea5df5fab63 Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Fri, 19 Apr 2024 12:35:19 +0100 Subject: [PATCH 11/14] Use the newest artefacts plugin --- .buildkite/pipeline.full.yml | 74 ++++++++++++++++++------------------ .buildkite/pipeline.yml | 2 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index c8e085e39..b525acd21 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -25,7 +25,7 @@ steps: # Python2 needed for WebGL to build EMSDK_PYTHON: "/Library/Frameworks/Python.framework/Versions/2.7/bin/python" plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage commands: @@ -47,7 +47,7 @@ steps: UNITY_VERSION: *2021 XCODE_VERSION: "15.3.0" plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage commands: @@ -69,7 +69,7 @@ steps: UNITY_VERSION: *2022 XCODE_VERSION: "15.3.0" plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage commands: @@ -91,7 +91,7 @@ steps: UNITY_VERSION: *2023 XCODE_VERSION: "15.3.0" plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage commands: @@ -116,7 +116,7 @@ steps: env: UNITY_VERSION: *2020 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/MacOS-2020.3.48f1.zip upload: @@ -135,7 +135,7 @@ steps: # env: # UNITY_VERSION: *2021 # plugins: - # artifacts#v1.5.0: + # artifacts#v1.9.0: # download: # - features/fixtures/maze_runner/build/MacOS-2021.3.36f1.zip # upload: @@ -152,7 +152,7 @@ steps: env: UNITY_VERSION: *2022 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/MacOS-2022.3.22f1.zip upload: @@ -169,7 +169,7 @@ steps: env: UNITY_VERSION: *2023 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/MacOS-2023.2.17f1.zip upload: @@ -191,7 +191,7 @@ steps: env: UNITY_VERSION: *2020 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/WebGL-2020.3.48f1.zip upload: @@ -209,7 +209,7 @@ steps: # env: # UNITY_VERSION: *2021 # plugins: - # artifacts#v1.5.0: + # artifacts#v1.9.0: # download: # - features/fixtures/maze_runner/build/WebGL-2021.3.36f1.zip # upload: @@ -226,7 +226,7 @@ steps: env: UNITY_VERSION: *2022 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/WebGL-2022.3.22f1.zip upload: @@ -243,7 +243,7 @@ steps: env: UNITY_VERSION: *2023 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/WebGL-2023.2.17f1.zip upload: @@ -262,7 +262,7 @@ steps: env: UNITY_VERSION: *2020 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -283,7 +283,7 @@ steps: env: UNITY_VERSION: *2022 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -304,7 +304,7 @@ steps: env: UNITY_VERSION: *2023 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -325,7 +325,7 @@ steps: # env: # UNITY_VERSION: *2020 # plugins: - # artifacts#v1.5.0: + # artifacts#v1.9.0: # download: # - Bugsnag.unitypackage # upload: @@ -351,7 +351,7 @@ steps: env: UNITY_VERSION: *2020 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - "features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk" upload: @@ -383,7 +383,7 @@ steps: env: UNITY_VERSION: *2022 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - "features/fixtures/maze_runner/mazerunner_2022.3.22f1.apk" upload: @@ -415,7 +415,7 @@ steps: env: UNITY_VERSION: *2023 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - "features/fixtures/maze_runner/mazerunner_2023.2.17f1.apk" upload: @@ -447,7 +447,7 @@ steps: # env: # UNITY_VERSION: *2021 # plugins: - # artifacts#v1.5.0: + # artifacts#v1.9.0: # download: # - "features/fixtures/EDM_Fixture/edm_2020.3.48f1.apk" # upload: @@ -474,7 +474,7 @@ steps: env: UNITY_VERSION: *2020 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -497,7 +497,7 @@ steps: XCODE_VERSION: "15.3.0" UNITY_VERSION: *2020 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage - project_2020.tgz @@ -520,7 +520,7 @@ steps: env: UNITY_VERSION: *2022 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -543,7 +543,7 @@ steps: UNITY_VERSION: *2022 XCODE_VERSION: "15.3.0" plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage - project_2022.tgz @@ -566,7 +566,7 @@ steps: env: UNITY_VERSION: *2023 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -589,7 +589,7 @@ steps: UNITY_VERSION: *2023 XCODE_VERSION: "15.3.0" plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage - project_2023.tgz @@ -614,7 +614,7 @@ steps: agents: queue: opensource plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - "features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa" upload: @@ -644,7 +644,7 @@ steps: agents: queue: opensource plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - "features/fixtures/maze_runner/mazerunner_2022.3.22f1.ipa" upload: @@ -674,7 +674,7 @@ steps: agents: queue: opensource plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - "features/fixtures/maze_runner/mazerunner_2023.2.17f1.ipa" upload: @@ -710,7 +710,7 @@ steps: env: UNITY_VERSION: *2020 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -734,7 +734,7 @@ steps: commands: - scripts/ci-build-windows-fixture-wsl.sh plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -757,7 +757,7 @@ steps: commands: - scripts/ci-build-windows-fixture-wsl.sh plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -780,7 +780,7 @@ steps: commands: - scripts/ci-build-windows-fixture-wsl.sh plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: @@ -803,7 +803,7 @@ steps: env: UNITY_VERSION: *2020 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/Windows-2020.3.48f1.zip upload: @@ -821,7 +821,7 @@ steps: env: UNITY_VERSION: *2021 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/Windows-2021.3.36f1.zip upload: @@ -838,7 +838,7 @@ steps: env: UNITY_VERSION: *2022 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/Windows-2022.3.22f1.zip upload: @@ -855,7 +855,7 @@ steps: env: UNITY_VERSION: "2023.2.15f1" plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - features/fixtures/maze_runner/build/Windows-2023.2.15f1.zip upload: diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 4845fbbbc..3afb65356 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -63,7 +63,7 @@ steps: env: UNITY_VERSION: *2021 plugins: - artifacts#v1.5.0: + artifacts#v1.9.0: download: - Bugsnag.unitypackage upload: From 89e1ba410968f6c44ca6274326731d13f1d46900 Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Fri, 26 Apr 2024 19:39:03 +0100 Subject: [PATCH 12/14] Skip Unity 2023 on Windows --- .buildkite/pipeline.full.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index b525acd21..9857adf01 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -770,6 +770,7 @@ steps: limit: 1 - label: Build Unity 2023 Windows test fixture + skip: Pending PLAT-12072 timeout_in_minutes: 30 key: "windows-2023-fixture" depends_on: "build-artifacts" @@ -848,6 +849,7 @@ steps: - scripts/ci-run-windows-tests-wsl.sh - label: Run Windows e2e tests for Unity 2023 + skip: Pending PLAT-12072 timeout_in_minutes: 30 depends_on: "windows-2023-fixture" agents: From b6782fe51797a6ad4df317121b1bd64185edb87c Mon Sep 17 00:00:00 2001 From: Steve Kirkland-Walton Date: Fri, 26 Apr 2024 20:04:21 +0100 Subject: [PATCH 13/14] Correct artefact names [full ci] --- .buildkite/pipeline.full.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml index c6b7fbc60..78310a520 100644 --- a/.buildkite/pipeline.full.yml +++ b/.buildkite/pipeline.full.yml @@ -98,8 +98,8 @@ steps: - scripts/ci-build-macos-packages.sh artifact_paths: - unity.log - - features/fixtures/maze_runner/build/MacOS-2023.2.17f1.zip - - features/fixtures/maze_runner/build/WebGL-2023.2.17f1.zip + - features/fixtures/maze_runner/build/MacOS-2023.zip + - features/fixtures/maze_runner/build/WebGL-2023.zip retry: automatic: - exit_status: "*" @@ -171,7 +171,7 @@ steps: plugins: artifacts#v1.9.0: download: - - features/fixtures/maze_runner/build/MacOS-2023.2.17f1.zip + - features/fixtures/maze_runner/build/MacOS-2023.zip upload: - maze_output/**/* - '*-mazerunner.log' @@ -245,7 +245,7 @@ steps: plugins: artifacts#v1.9.0: download: - - features/fixtures/maze_runner/build/WebGL-2023.2.17f1.zip + - features/fixtures/maze_runner/build/WebGL-2023.zip upload: - maze_output/**/* # TODO: WebGL persistence tests are currently skipped pending PLAT-8151 @@ -308,7 +308,7 @@ steps: download: - Bugsnag.unitypackage upload: - - features/fixtures/maze_runner/mazerunner_2023.2.17f1.apk + - features/fixtures/maze_runner/mazerunner_2023.apk - features/fixtures/build_android_apk.log commands: - bundle install @@ -417,7 +417,7 @@ steps: plugins: artifacts#v1.9.0: download: - - "features/fixtures/maze_runner/mazerunner_2023.2.17f1.apk" + - "features/fixtures/maze_runner/mazerunner_2023.apk" upload: - "maze_output/**/*" - "maze_output/metrics.csv" @@ -428,7 +428,7 @@ steps: command: - "features/csharp" - "features/android" - - "--app=features/fixtures/maze_runner/mazerunner_2023.2.17f1.apk" + - "--app=features/fixtures/maze_runner/mazerunner_2023.apk" - "--farm=bb" - "--appium-version=1.22" - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13" @@ -594,7 +594,7 @@ steps: - Bugsnag.unitypackage - project_2023.tgz upload: - - features/fixtures/maze_runner/mazerunner_2023.2.17f1.ipa + - features/fixtures/maze_runner/mazerunner_2023.ipa - features/fixtures/unity.log commands: - bundle install @@ -676,7 +676,7 @@ steps: plugins: artifacts#v1.9.0: download: - - "features/fixtures/maze_runner/mazerunner_2023.2.17f1.ipa" + - "features/fixtures/maze_runner/mazerunner_2023.ipa" upload: - "maze_output/**/*" - "maze_output/metrics.csv" @@ -687,7 +687,7 @@ steps: command: - "features/csharp" - "features/ios" - - "--app=features/fixtures/maze_runner/mazerunner_2023.2.17f1.ipa" + - "--app=features/fixtures/maze_runner/mazerunner_2023.ipa" - "--farm=bb" - "--appium-version=1.22" - "--device=IOS_13|IOS_14|IOS_15" @@ -787,7 +787,7 @@ steps: upload: - unity.log - unity_import.log - - features/fixtures/maze_runner/build/Windows-2023.2.17f1.zip + - features/fixtures/maze_runner/build/Windows-2023.zip retry: automatic: - exit_status: "*" @@ -855,11 +855,11 @@ steps: agents: queue: windows-general-wsl env: - UNITY_VERSION: "2023.2.15f1" + UNITY_VERSION: *2023 plugins: artifacts#v1.9.0: download: - - features/fixtures/maze_runner/build/Windows-2023.2.15f1.zip + - features/fixtures/maze_runner/build/Windows-2023.zip upload: - maze_output/**/* - maze_output/metrics.csv From ba428735e2baef3ee8ce10c1277a9929449bfa9f Mon Sep 17 00:00:00 2001 From: Richard Elms Date: Thu, 2 May 2024 09:36:47 +0200 Subject: [PATCH 14/14] Release v7.7.5 --- CHANGELOG.md | 4 ++-- build.cake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 881b2fcf8..f5e3f3cf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## TBD +## 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-05-19) +## 7.7.4 (2024-04-19) ### Bug Fixes diff --git a/build.cake b/build.cake index 5b2dc12c1..327ccfa42 100644 --- a/build.cake +++ b/build.cake @@ -5,7 +5,7 @@ var target = Argument("target", "Default"); var solution = File("./BugsnagUnity.sln"); var configuration = Argument("configuration", "Release"); var project = File("./src/BugsnagUnity/BugsnagUnity.csproj"); -var version = "7.7.4"; +var version = "7.7.5"; Task("Restore-NuGet-Packages") .Does(() => NuGetRestore(solution));