Skip to content

Commit a91d515

Browse files
rich-bugsnagrich-bugsnag
authored
Merge pull request #586 from bugsnag/next
Release v7.1.0
2 parents 66ea3ee + ce1e8af commit a91d515

File tree

69 files changed

+1761
-1502
lines changed

Some content is hidden

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

69 files changed

+1761
-1502
lines changed

‎.buildkite/block.full.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
- block: 'Trigger a full build'
3+
key: 'trigger-full-build'
4+
5+
- label: 'Upload the full test pipeline'
6+
depends_on: 'trigger-full-build'
7+
command: buildkite-agent pipeline upload .buildkite/pipeline.full.yml

‎.buildkite/pipeline.full.yml‎

Lines changed: 77 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ steps:
5252
key: 'cocoa-webgl-2021-fixtures'
5353
depends_on: 'build-artifacts'
5454
env:
55-
UNITY_VERSION: "2021.2.17f1"
55+
UNITY_VERSION: "2021.3.3f1"
5656
plugins:
5757
artifacts#v1.5.0:
5858
download:
@@ -61,8 +61,8 @@ steps:
6161
- scripts/ci-build-macos-packages.sh
6262
artifact_paths:
6363
- unity.log
64-
- features/fixtures/maze_runner/build/MacOS-2021.2.17f1.zip
65-
- features/fixtures/maze_runner/build/WebGL-2021.2.17f1.zip
64+
- features/fixtures/maze_runner/build/MacOS-2021.3.3f1.zip
65+
- features/fixtures/maze_runner/build/WebGL-2021.3.3f1.zip
6666
retry:
6767
automatic:
6868
- exit_status: "*"
@@ -111,11 +111,11 @@ steps:
111111
agents:
112112
queue: macos-12-arm-unity
113113
env:
114-
UNITY_VERSION: "2021.2.17f1"
114+
UNITY_VERSION: "2021.3.3f1"
115115
plugins:
116116
artifacts#v1.5.0:
117117
download:
118-
- features/fixtures/maze_runner/build/MacOS-2021.2.17f1.zip
118+
- features/fixtures/maze_runner/build/MacOS-2021.3.3f1.zip
119119
upload:
120120
- maze_output/**/*
121121
- Mazerunner.log
@@ -164,14 +164,12 @@ steps:
164164
- label: Run WebGL e2e tests for Unity 2021
165165
timeout_in_minutes: 30
166166
depends_on: 'cocoa-webgl-2021-fixtures'
167-
agents:
168-
queue: opensource-mac-cocoa-11
169167
env:
170-
UNITY_VERSION: "2021.2.17f1"
168+
UNITY_VERSION: "2021.3.3f1"
171169
plugins:
172170
artifacts#v1.5.0:
173171
download:
174-
- features/fixtures/maze_runner/build/WebGL-2021.2.17f1.zip
172+
- features/fixtures/maze_runner/build/WebGL-2021.3.3f1.zip
175173
upload:
176174
- maze_output/**/*
177175
# TODO: WebGL persistence tests are currently skipped pending PLAT-8151
@@ -226,13 +224,13 @@ steps:
226224
key: 'build-android-fixture-2021'
227225
depends_on: 'build-artifacts'
228226
env:
229-
UNITY_VERSION: "2021.2.17f1"
227+
UNITY_VERSION: "2021.3.3f1"
230228
plugins:
231229
artifacts#v1.5.0:
232230
download:
233231
- Bugsnag.unitypackage
234232
upload:
235-
- features/fixtures/maze_runner/mazerunner_2021.2.17f1.apk
233+
- features/fixtures/maze_runner/mazerunner_2021.3.3f1.apk
236234
- features/fixtures/unity.log
237235
commands:
238236
- rake test:android:build
@@ -246,13 +244,13 @@ steps:
246244
key: 'build-edm-fixture-2021'
247245
depends_on: 'build-artifacts'
248246
env:
249-
UNITY_VERSION: "2021.2.17f1"
247+
UNITY_VERSION: "2021.3.3f1"
250248
plugins:
251249
artifacts#v1.5.0:
252250
download:
253251
- Bugsnag.unitypackage
254252
upload:
255-
- features/fixtures/EDM_Fixture/edm_2021.2.17f1.apk
253+
- features/fixtures/EDM_Fixture/edm_2021.3.3f1.apk
256254
- features/scripts/mobile/buildEdmFixture.log
257255
- features/scripts/mobile/edmImport.log
258256
- features/scripts/mobile/enableEdm.log
@@ -322,14 +320,14 @@ steps:
322320
plugins:
323321
artifacts#v1.5.0:
324322
download:
325-
- "features/fixtures/maze_runner/mazerunner_2021.2.17f1.apk"
323+
- "features/fixtures/maze_runner/mazerunner_2021.3.3f1.apk"
326324
upload:
327325
- "maze_output/**/*"
328326
docker-compose#v3.7.0:
329327
pull: maze-runner
330328
run: maze-runner
331329
command:
332-
- "--app=/app/features/fixtures/maze_runner/mazerunner_2021.2.17f1.apk"
330+
- "--app=/app/features/fixtures/maze_runner/mazerunner_2021.3.3f1.apk"
333331
- "--farm=bs"
334332
- "--device=ANDROID_9_0"
335333
- "features/android"
@@ -343,18 +341,18 @@ steps:
343341
agents:
344342
queue: opensource
345343
env:
346-
UNITY_VERSION: "2021.2.17f1"
344+
UNITY_VERSION: "2021.3.3f1"
347345
plugins:
348346
artifacts#v1.5.0:
349347
download:
350-
- "features/fixtures/EDM_Fixture/edm_2021.2.17f1.apk"
348+
- "features/fixtures/EDM_Fixture/edm_2021.3.3f1.apk"
351349
upload:
352350
- "maze_output/**/*"
353351
docker-compose#v3.7.0:
354352
pull: maze-runner
355353
run: maze-runner
356354
command:
357-
- "--app=/app/features/fixtures/EDM_Fixture/edm_2021.2.17f1.apk"
355+
- "--app=/app/features/fixtures/EDM_Fixture/edm_2021.3.3f1.apk"
358356
- "--farm=bs"
359357
- "--device=ANDROID_9_0"
360358
- "features/edm"
@@ -460,7 +458,7 @@ steps:
460458
key: 'generate-fixture-project-2021'
461459
depends_on: 'build-artifacts'
462460
env:
463-
UNITY_VERSION: "2021.2.17f1"
461+
UNITY_VERSION: "2021.3.3f1"
464462
plugins:
465463
artifacts#v1.5.0:
466464
download:
@@ -483,14 +481,14 @@ steps:
483481
agents:
484482
queue: macos-12-arm-unity
485483
env:
486-
UNITY_VERSION: "2021.2.17f1"
484+
UNITY_VERSION: "2021.3.3f1"
487485
plugins:
488486
artifacts#v1.5.0:
489487
download:
490488
- Bugsnag.unitypackage
491489
- project_2021.tgz
492490
upload:
493-
- features/fixtures/maze_runner/mazerunner_2021.2.17f1.ipa
491+
- features/fixtures/maze_runner/mazerunner_2021.3.3f1.ipa
494492
- features/fixtures/unity.log
495493
commands:
496494
- tar -zxf project_2021.tgz features/fixtures/maze_runner
@@ -559,14 +557,14 @@ steps:
559557
plugins:
560558
artifacts#v1.5.0:
561559
download:
562-
- "features/fixtures/maze_runner/mazerunner_2021.2.17f1.ipa"
560+
- "features/fixtures/maze_runner/mazerunner_2021.3.3f1.ipa"
563561
upload:
564562
- "maze_output/**/*"
565563
docker-compose#v3.7.0:
566564
pull: maze-runner
567565
run: maze-runner
568566
command:
569-
- "--app=/app/features/fixtures/maze_runner/mazerunner_2021.2.17f1.ipa"
567+
- "--app=/app/features/fixtures/maze_runner/mazerunner_2021.3.3f1.ipa"
570568
- "--farm=bs"
571569
- "--device=IOS_14"
572570
- "--fail-fast"
@@ -583,14 +581,18 @@ steps:
583581
key: 'windows-2018-fixture'
584582
depends_on: 'build-artifacts'
585583
agents:
586-
queue: opensource-windows-unity
584+
queue: windows-general-wsl
587585
env:
588586
UNITY_VERSION: "2018.4.36f1"
589587
command:
590-
- scripts/ci-build-windows-package.bat
591-
artifact_paths:
592-
- unity.log
593-
- features/fixtures/maze_runner/build/Windows-2018.4.36f1.zip
588+
- scripts/ci-build-windows-fixture-wsl.sh
589+
plugins:
590+
artifacts#v1.5.0:
591+
download:
592+
- Bugsnag.unitypackage
593+
upload:
594+
- unity.log
595+
- features/fixtures/maze_runner/build/Windows-2018.4.36f1.zip
594596
retry:
595597
automatic:
596598
- exit_status: "*"
@@ -601,14 +603,18 @@ steps:
601603
key: 'windows-2019-fixture'
602604
depends_on: 'build-artifacts'
603605
agents:
604-
queue: opensource-windows-unity
606+
queue: windows-general-wsl
605607
env:
606608
UNITY_VERSION: "2019.4.35f1"
607609
command:
608-
- scripts/ci-build-windows-package.bat
609-
artifact_paths:
610-
- unity.log
611-
- features/fixtures/maze_runner/build/Windows-2019.4.35f1.zip
610+
- scripts/ci-build-windows-fixture-wsl.sh
611+
plugins:
612+
artifacts#v1.5.0:
613+
download:
614+
- Bugsnag.unitypackage
615+
upload:
616+
- unity.log
617+
- features/fixtures/maze_runner/build/Windows-2019.4.35f1.zip
612618
retry:
613619
automatic:
614620
- exit_status: "*"
@@ -619,14 +625,18 @@ steps:
619625
key: 'windows-2021-fixture'
620626
depends_on: 'build-artifacts'
621627
agents:
622-
queue: opensource-windows-unity
628+
queue: windows-general-wsl
623629
env:
624-
UNITY_VERSION: "2021.2.17f1"
630+
UNITY_VERSION: "2021.3.3f1"
625631
commands:
626-
- scripts/ci-build-windows-package.bat
627-
artifact_paths:
628-
- unity.log
629-
- features/fixtures/maze_runner/build/Windows-2021.2.17f1.zip
632+
- scripts/ci-build-windows-fixture-wsl.sh
633+
plugins:
634+
artifacts#v1.5.0:
635+
download:
636+
- Bugsnag.unitypackage
637+
upload:
638+
- unity.log
639+
- features/fixtures/maze_runner/build/Windows-2021.3.3f1.zip
630640
retry:
631641
automatic:
632642
- exit_status: "*"
@@ -639,37 +649,46 @@ steps:
639649
timeout_in_minutes: 30
640650
depends_on: 'windows-2018-fixture'
641651
agents:
642-
queue: opensource-windows-unity
652+
queue: windows-general-wsl
643653
env:
644654
UNITY_VERSION: "2018.4.36f1"
645-
WSLENV: "UNITY_VERSION"
646-
command:
647-
- scripts/ci-run-windows-tests.bat
648-
artifact_paths:
649-
- maze_output/**/*
655+
plugins:
656+
artifacts#v1.5.0:
657+
download:
658+
- features/fixtures/maze_runner/build/Windows-2018.4.36f1.zip
659+
upload:
660+
- maze_output/**/*
661+
commands:
662+
- scripts/ci-run-windows-tests-wsl.sh
650663

651664
- label: Run Windows e2e tests for Unity 2019
652665
timeout_in_minutes: 30
653666
depends_on: 'windows-2019-fixture'
654667
agents:
655-
queue: opensource-windows-unity
668+
queue: windows-general-wsl
656669
env:
657670
UNITY_VERSION: "2019.4.35f1"
658-
WSLENV: "UNITY_VERSION"
659-
command:
660-
- scripts/ci-run-windows-tests.bat
661-
artifact_paths:
662-
- maze_output/**/*
671+
plugins:
672+
artifacts#v1.5.0:
673+
download:
674+
- features/fixtures/maze_runner/build/Windows-2019.4.35f1.zip
675+
upload:
676+
- maze_output/**/*
677+
commands:
678+
- scripts/ci-run-windows-tests-wsl.sh
663679

664680
- label: Run Windows e2e tests for Unity 2021
665681
timeout_in_minutes: 30
666682
depends_on: 'windows-2021-fixture'
667683
agents:
668-
queue: opensource-windows-unity
684+
queue: windows-general-wsl
669685
env:
670-
UNITY_VERSION: "2021.2.17f1"
671-
WSLENV: "UNITY_VERSION"
672-
command:
673-
- scripts/ci-run-windows-tests.bat
674-
artifact_paths:
675-
- maze_output/**/*
686+
UNITY_VERSION: "2021.3.3f1"
687+
plugins:
688+
artifacts#v1.5.0:
689+
download:
690+
- features/fixtures/maze_runner/build/Windows-2021.3.3f1.zip
691+
upload:
692+
- maze_output/**/*
693+
commands:
694+
- scripts/ci-run-windows-tests-wsl.sh

‎.buildkite/pipeline.yml‎

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ steps:
66
#
77
# Build notifier. We run tests for all Unity versions with the 2018 artifacts, as that is what we ship.
88
#
9-
- label: Build notifier artifacts
9+
- label: Build released notifier artifact
1010
timeout_in_minutes: 30
1111
key: 'build-artifacts'
1212
env:
@@ -21,6 +21,20 @@ steps:
2121
- exit_status: "*"
2222
limit: 1
2323

24+
- label: Ensure notifier builds on Windows (for development)
25+
skip: Pending PLAT-8676
26+
timeout_in_minutes: 30
27+
agents:
28+
queue: opensource-windows-unity
29+
env:
30+
UNITY_VERSION: "2018.4.36f1"
31+
command:
32+
- scripts/ci-build-windows-plugin.bat
33+
retry:
34+
automatic:
35+
- exit_status: "*"
36+
limit: 1
37+
2438
#
2539
# Build MacOS and WebGL test fixtures
2640
#
@@ -266,14 +280,18 @@ steps:
266280
key: 'windows-2020-fixture'
267281
depends_on: 'build-artifacts'
268282
agents:
269-
queue: opensource-windows-unity
283+
queue: windows-general-wsl
270284
env:
271285
UNITY_VERSION: "2020.3.32f1"
286+
plugins:
287+
artifacts#v1.5.0:
288+
download:
289+
- Bugsnag.unitypackage
290+
upload:
291+
- unity.log
292+
- features/fixtures/maze_runner/build/Windows-2020.3.32f1.zip
272293
commands:
273-
- scripts/ci-build-windows-package.bat
274-
artifact_paths:
275-
- unity.log
276-
- features/fixtures/maze_runner/build/Windows-2020.3.32f1.zip
294+
- scripts/ci-build-windows-fixture-wsl.sh
277295
retry:
278296
automatic:
279297
- exit_status: "*"
@@ -286,14 +304,17 @@ steps:
286304
timeout_in_minutes: 30
287305
depends_on: 'windows-2020-fixture'
288306
agents:
289-
queue: opensource-windows-unity
307+
queue: windows-general-wsl
290308
env:
291309
UNITY_VERSION: "2020.3.32f1"
292-
WSLENV: "UNITY_VERSION"
310+
plugins:
311+
artifacts#v1.5.0:
312+
download:
313+
- features/fixtures/maze_runner/build/Windows-2020.3.32f1.zip
314+
upload:
315+
- maze_output/**/*
293316
command:
294-
- scripts/ci-run-windows-tests.bat
295-
artifact_paths:
296-
- maze_output/**/*
317+
- scripts/ci-run-windows-tests-wsl.sh
297318

298319
#
299320
# Conditionally trigger full pipeline

‎.buildkite/pipeline_trigger.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ if [[ "$BUILDKITE_MESSAGE" == *"[full ci]"* ||
77
"$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "master" ]]; then
88
echo "Running full build"
99
buildkite-agent pipeline upload .buildkite/pipeline.full.yml
10+
else
11+
# Basic build, but allow a full build to be triggered
12+
echo "Running basic build"
13+
buildkite-agent pipeline upload .buildkite/block.full.yml
1014
fi

0 commit comments

Comments
 (0)