Skip to content

Commit 48e841a

Browse files
YYChen01988YYChen01988
authored
Merge pull request #2150 from bugsnag/main
sync main and next
2 parents a6ed71d + d51fd3a commit 48e841a

File tree

6 files changed

+53
-53
lines changed

6 files changed

+53
-53
lines changed

‎.buildkite/pipeline.full.yml

+28-28
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ steps:
6767
test-collector#v1.10.2:
6868
files: "reports/TEST-*.xml"
6969
format: "junit"
70-
branch: "^master|next$$"
70+
branch: "^main|next$$"
7171
concurrency: 25
7272
concurrency_group: 'bitbar'
7373
concurrency_method: eager
@@ -92,7 +92,7 @@ steps:
9292
test-collector#v1.10.2:
9393
files: "reports/TEST-*.xml"
9494
format: "junit"
95-
branch: "^master|next$$"
95+
branch: "^main|next$$"
9696
concurrency: 5
9797
concurrency_group: 'browserstack-app'
9898
concurrency_method: eager
@@ -125,7 +125,7 @@ steps:
125125
test-collector#v1.10.2:
126126
files: "reports/TEST-*.xml"
127127
format: "junit"
128-
branch: "^master|next$$"
128+
branch: "^main|next$$"
129129
env:
130130
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-debug"
131131
concurrency: 25
@@ -154,7 +154,7 @@ steps:
154154
test-collector#v1.10.2:
155155
files: "reports/TEST-*.xml"
156156
format: "junit"
157-
branch: "^master|next$$"
157+
branch: "^main|next$$"
158158
env:
159159
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-debug"
160160
concurrency: 5
@@ -189,7 +189,7 @@ steps:
189189
test-collector#v1.10.2:
190190
files: "reports/TEST-*.xml"
191191
format: "junit"
192-
branch: "^master|next$$"
192+
branch: "^main|next$$"
193193
env:
194194
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
195195
concurrency: 25
@@ -223,7 +223,7 @@ steps:
223223
test-collector#v1.10.2:
224224
files: "reports/TEST-*.xml"
225225
format: "junit"
226-
branch: "^master|next$$"
226+
branch: "^main|next$$"
227227
env:
228228
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
229229
concurrency: 25
@@ -255,7 +255,7 @@ steps:
255255
test-collector#v1.10.2:
256256
files: "reports/TEST-*.xml"
257257
format: "junit"
258-
branch: "^master|next$$"
258+
branch: "^main|next$$"
259259
env:
260260
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
261261
concurrency: 5
@@ -288,7 +288,7 @@ steps:
288288
test-collector#v1.10.2:
289289
files: "reports/TEST-*.xml"
290290
format: "junit"
291-
branch: "^master|next$$"
291+
branch: "^main|next$$"
292292
env:
293293
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
294294
concurrency: 25
@@ -321,7 +321,7 @@ steps:
321321
test-collector#v1.10.2:
322322
files: "reports/TEST-*.xml"
323323
format: "junit"
324-
branch: "^master|next$$"
324+
branch: "^main|next$$"
325325
env:
326326
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
327327
concurrency: 25
@@ -351,7 +351,7 @@ steps:
351351
test-collector#v1.10.2:
352352
files: "reports/TEST-*.xml"
353353
format: "junit"
354-
branch: "^master|next$$"
354+
branch: "^main|next$$"
355355
env:
356356
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
357357
concurrency: 5
@@ -386,7 +386,7 @@ steps:
386386
test-collector#v1.10.2:
387387
files: "reports/TEST-*.xml"
388388
format: "junit"
389-
branch: "^master|next$$"
389+
branch: "^main|next$$"
390390
env:
391391
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
392392
concurrency: 25
@@ -421,7 +421,7 @@ steps:
421421
test-collector#v1.10.2:
422422
files: "reports/TEST-*.xml"
423423
format: "junit"
424-
branch: "^master|next$$"
424+
branch: "^main|next$$"
425425
env:
426426
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
427427
concurrency: 25
@@ -453,7 +453,7 @@ steps:
453453
test-collector#v1.10.2:
454454
files: "reports/TEST-*.xml"
455455
format: "junit"
456-
branch: "^master|next$$"
456+
branch: "^main|next$$"
457457
env:
458458
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
459459
concurrency: 5
@@ -488,7 +488,7 @@ steps:
488488
test-collector#v1.10.2:
489489
files: "reports/TEST-*.xml"
490490
format: "junit"
491-
branch: "^master|next$$"
491+
branch: "^main|next$$"
492492
env:
493493
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
494494
concurrency: 25
@@ -523,7 +523,7 @@ steps:
523523
test-collector#v1.10.2:
524524
files: "reports/TEST-*.xml"
525525
format: "junit"
526-
branch: "^master|next$$"
526+
branch: "^main|next$$"
527527
env:
528528
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
529529
concurrency: 25
@@ -554,7 +554,7 @@ steps:
554554
test-collector#v1.10.2:
555555
files: "reports/TEST-*.xml"
556556
format: "junit"
557-
branch: "^master|next$$"
557+
branch: "^main|next$$"
558558
env:
559559
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
560560
concurrency: 5
@@ -593,7 +593,7 @@ steps:
593593
test-collector#v1.10.2:
594594
files: "reports/TEST-*.xml"
595595
format: "junit"
596-
branch: "^master|next$$"
596+
branch: "^main|next$$"
597597
env:
598598
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
599599
concurrency: 25
@@ -628,7 +628,7 @@ steps:
628628
test-collector#v1.10.2:
629629
files: "reports/TEST-*.xml"
630630
format: "junit"
631-
branch: "^master|next$$"
631+
branch: "^main|next$$"
632632
env:
633633
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
634634
concurrency: 25
@@ -659,7 +659,7 @@ steps:
659659
test-collector#v1.10.2:
660660
files: "reports/TEST-*.xml"
661661
format: "junit"
662-
branch: "^master|next$$"
662+
branch: "^main|next$$"
663663
env:
664664
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
665665
concurrency: 5
@@ -694,7 +694,7 @@ steps:
694694
test-collector#v1.10.2:
695695
files: "reports/TEST-*.xml"
696696
format: "junit"
697-
branch: "^master|next$$"
697+
branch: "^main|next$$"
698698
env:
699699
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
700700
concurrency: 25
@@ -729,7 +729,7 @@ steps:
729729
test-collector#v1.10.2:
730730
files: "reports/TEST-*.xml"
731731
format: "junit"
732-
branch: "^master|next$$"
732+
branch: "^main|next$$"
733733
env:
734734
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
735735
concurrency: 25
@@ -760,7 +760,7 @@ steps:
760760
test-collector#v1.10.2:
761761
files: "reports/TEST-*.xml"
762762
format: "junit"
763-
branch: "^master|next$$"
763+
branch: "^main|next$$"
764764
env:
765765
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
766766
concurrency: 5
@@ -795,7 +795,7 @@ steps:
795795
test-collector#v1.10.2:
796796
files: "reports/TEST-*.xml"
797797
format: "junit"
798-
branch: "^master|next$$"
798+
branch: "^main|next$$"
799799
env:
800800
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
801801
concurrency: 25
@@ -830,7 +830,7 @@ steps:
830830
test-collector#v1.10.2:
831831
files: "reports/TEST-*.xml"
832832
format: "junit"
833-
branch: "^master|next$$"
833+
branch: "^main|next$$"
834834
env:
835835
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
836836
concurrency: 25
@@ -861,7 +861,7 @@ steps:
861861
test-collector#v1.10.2:
862862
files: "reports/TEST-*.xml"
863863
format: "junit"
864-
branch: "^master|next$$"
864+
branch: "^main|next$$"
865865
env:
866866
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
867867
concurrency: 5
@@ -871,12 +871,12 @@ steps:
871871
# If there is a tag present activate a manual publishing step
872872

873873
- block: 'Trigger package publish'
874-
if: build.branch == "master"
874+
if: build.branch == "main"
875875
key: trigger-publish
876876
blocked_state: passed
877877

878878
- label: ':docker: Build Android base image'
879-
if: build.branch == "master"
879+
if: build.branch == "main"
880880
key: 'android-common'
881881
timeout_in_minutes: 30
882882
depends_on: 'trigger-publish'
@@ -892,7 +892,7 @@ steps:
892892
- android-common:855461928731.dkr.ecr.us-west-1.amazonaws.com/android:latest
893893

894894
- label: 'Publish :rocket:'
895-
if: build.branch == "master"
895+
if: build.branch == "main"
896896
depends_on: 'android-common'
897897
timeout_in_minutes: 30
898898
env:

‎.buildkite/pipeline.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ steps:
133133
test-collector#v1.10.2:
134134
files: "reports/TEST-*.xml"
135135
format: "junit"
136-
branch: "^master|next$$"
136+
branch: "^main|next$$"
137137
env:
138138
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
139139
concurrency: 25
@@ -164,7 +164,7 @@ steps:
164164
test-collector#v1.10.2:
165165
files: "reports/TEST-*.xml"
166166
format: "junit"
167-
branch: "^master|next$$"
167+
branch: "^main|next$$"
168168
env:
169169
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
170170
concurrency: 5
@@ -196,7 +196,7 @@ steps:
196196
test-collector#v1.10.2:
197197
files: "reports/TEST-*.xml"
198198
format: "junit"
199-
branch: "^master|next$$"
199+
branch: "^main|next$$"
200200
env:
201201
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
202202
concurrency: 25
@@ -225,7 +225,7 @@ steps:
225225
test-collector#v1.10.2:
226226
files: "reports/TEST-*.xml"
227227
format: "junit"
228-
branch: "^master|next$$"
228+
branch: "^main|next$$"
229229
env:
230230
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r19"
231231
concurrency: 5
@@ -259,7 +259,7 @@ steps:
259259
test-collector#v1.10.2:
260260
files: "reports/TEST-*.xml"
261261
format: "junit"
262-
branch: "^master|next$$"
262+
branch: "^main|next$$"
263263
env:
264264
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
265265
concurrency: 25
@@ -320,7 +320,7 @@ steps:
320320
test-collector#v1.10.2:
321321
files: "reports/TEST-*.xml"
322322
format: "junit"
323-
branch: "^master|next$$"
323+
branch: "^main|next$$"
324324
env:
325325
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
326326
concurrency: 25
@@ -351,7 +351,7 @@ steps:
351351
test-collector#v1.10.2:
352352
files: "reports/TEST-*.xml"
353353
format: "junit"
354-
branch: "^master|next$$"
354+
branch: "^main|next$$"
355355
env:
356356
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
357357
concurrency: 5
@@ -386,7 +386,7 @@ steps:
386386
test-collector#v1.10.2:
387387
files: "reports/TEST-*.xml"
388388
format: "junit"
389-
branch: "^master|next$$"
389+
branch: "^main|next$$"
390390
env:
391391
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
392392
concurrency: 25
@@ -418,7 +418,7 @@ steps:
418418
test-collector#v1.10.2:
419419
files: "reports/TEST-*.xml"
420420
format: "junit"
421-
branch: "^master|next$$"
421+
branch: "^main|next$$"
422422
env:
423423
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
424424
concurrency: 5
@@ -458,7 +458,7 @@ steps:
458458
test-collector#v1.10.2:
459459
files: "reports/TEST-*.xml"
460460
format: "junit"
461-
branch: "^master|next$$"
461+
branch: "^main|next$$"
462462
env:
463463
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
464464
concurrency: 25
@@ -490,7 +490,7 @@ steps:
490490
test-collector#v1.10.2:
491491
files: "reports/TEST-*.xml"
492492
format: "junit"
493-
branch: "^master|next$$"
493+
branch: "^main|next$$"
494494
env:
495495
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
496496
concurrency: 5
@@ -526,7 +526,7 @@ steps:
526526
test-collector#v1.10.2:
527527
files: "reports/TEST-*.xml"
528528
format: "junit"
529-
branch: "^master|next$$"
529+
branch: "^main|next$$"
530530
env:
531531
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
532532
concurrency: 25
@@ -560,7 +560,7 @@ steps:
560560
test-collector#v1.10.2:
561561
files: "reports/TEST-*.xml"
562562
format: "junit"
563-
branch: "^master|next$$"
563+
branch: "^main|next$$"
564564
env:
565565
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
566566
concurrency: 25
@@ -591,7 +591,7 @@ steps:
591591
test-collector#v1.10.2:
592592
files: "reports/TEST-*.xml"
593593
format: "junit"
594-
branch: "^master|next$$"
594+
branch: "^main|next$$"
595595
env:
596596
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
597597
concurrency: 5
@@ -625,7 +625,7 @@ steps:
625625
test-collector#v1.10.2:
626626
files: "reports/TEST-*.xml"
627627
format: "junit"
628-
branch: "^master|next$$"
628+
branch: "^main|next$$"
629629
env:
630630
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
631631
concurrency: 25
@@ -656,7 +656,7 @@ steps:
656656
test-collector#v1.10.2:
657657
files: "reports/TEST-*.xml"
658658
format: "junit"
659-
branch: "^master|next$$"
659+
branch: "^main|next$$"
660660
env:
661661
TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
662662
concurrency: 5

0 commit comments

Comments
 (0)