Skip to content

Commit f7ef462

Browse files
MahdiBMMahdiBM
committed
Merge remote-tracking branch 'upstream/main' into patch-2
2 parents cfa45f6 + bcfa803 commit f7ef462

File tree

3 files changed

+33
-113
lines changed

3 files changed

+33
-113
lines changed

‎projects-cperf-smoketest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"compatibility": [
3434
{
3535
"version": "5.1",
36-
"commit": "23ef6c73ee3bc12ee3940136aea54bd44a02e93e"
36+
"commit": "44450a8f564d7c0165f736ba2250649ff8d3e556"
3737
}
3838
],
3939
"platforms": [

‎projects.json

+32-40
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,9 @@
541541
"configuration": "Release",
542542
"xfail": [
543543
{
544-
"issue": "https://github.com/apple/swift/issues/70742",
544+
"issue": "https://github.com/swiftlang/swift/issues/78863",
545545
"compatibility": ["4.0", "4.2"],
546-
"branch": ["main", "release/5.9", "release/5.10", "release/6.0"],
546+
"branch": ["main", "release/6.0", "release/6.1"],
547547
"job": ["source-compat"],
548548
"platform": "Darwin"
549549
}
@@ -558,9 +558,9 @@
558558
"tags": "sourcekit-disabled",
559559
"xfail": [
560560
{
561-
"issue": "https://github.com/apple/swift/issues/70742",
561+
"issue": "https://github.com/swiftlang/swift/issues/78863",
562562
"compatibility": ["4.0", "4.2"],
563-
"branch": ["main", "release/5.9", "release/5.10", "release/6.0"],
563+
"branch": ["main", "release/6.0", "release/6.1"],
564564
"job": ["source-compat"],
565565
"platform": "Darwin"
566566
}
@@ -574,9 +574,9 @@
574574
"configuration": "Release",
575575
"xfail": [
576576
{
577-
"issue": "https://github.com/apple/swift/issues/70742",
577+
"issue": "https://github.com/swiftlang/swift/issues/78863",
578578
"compatibility": ["4.0", "4.2"],
579-
"branch": ["main", "release/5.9", "release/5.10", "release/6.0"],
579+
"branch": ["main", "release/6.0", "release/6.1"],
580580
"job": ["source-compat"],
581581
"platform": "Darwin"
582582
}
@@ -590,9 +590,9 @@
590590
"configuration": "Release",
591591
"xfail": [
592592
{
593-
"issue": "https://github.com/apple/swift/issues/70742",
593+
"issue": "https://github.com/swiftlang/swift/issues/78863",
594594
"compatibility": ["4.0", "4.2"],
595-
"branch": ["main", "release/5.9", "release/5.10", "release/6.0"],
595+
"branch": ["main", "release/6.0", "release/6.1"],
596596
"job": ["source-compat"],
597597
"platform": "Darwin"
598598
}
@@ -718,7 +718,7 @@
718718
{
719719
"issue": "https://github.com/swiftlang/swift/issues/75498",
720720
"compatibility": ["5.0"],
721-
"branch": ["main", "release/6.0"],
721+
"branch": ["main", "release/6.0", "release/6.1"],
722722
"platform": "Linux",
723723
"job": ["source-compat"]
724724
}
@@ -786,7 +786,7 @@
786786
{
787787
"issue": "https://github.com/apple/swift/issues/70764",
788788
"compatibility": "5.0",
789-
"branch": ["release/5.9", "release/5.10", "release/6.0"],
789+
"branch": ["release/5.9", "release/5.10", "release/6.0", "release/6.1"],
790790
"configuration": "debug",
791791
"platform": "Darwin",
792792
"job": ["source-compat"]
@@ -918,9 +918,9 @@
918918
"build_tests": "true",
919919
"xfail": [
920920
{
921-
"issue": "https://github.com/apple/swift/issues/61614",
921+
"issue": "https://github.com/swiftlang/swift/issues/78864",
922922
"compatibility": ["4.2", "5.0"],
923-
"branch": ["main", "release/5.5", "release/5.6", "release/5.7", "release/5.8", "release/5.9", "release/5.10", "release/6.0"],
923+
"branch": ["main", "release/6.0", "release/6.1"],
924924
"job": ["source-compat"],
925925
"configuration": "debug"
926926
}
@@ -1379,9 +1379,9 @@
13791379
"configuration": "Release",
13801380
"xfail": [
13811381
{
1382-
"issue": "https://github.com/apple/swift/issues/69410",
1382+
"issue": "https://github.com/swiftlang/swift/issues/78866",
13831383
"compatibility": ["5.0"],
1384-
"branch": ["main", "release/6.0"],
1384+
"branch": ["main", "release/6.0", "release/6.1"],
13851385
"job": ["source-compat"],
13861386
"platform": "Darwin"
13871387
}
@@ -1420,14 +1420,14 @@
14201420
"issue": "rdar://83373628",
14211421
"platform": "Linux",
14221422
"compatibility": "5.0",
1423-
"branch": ["main", "release/5.6", "release/5.7", "release/5.8", "release/5.9", "release/5.10", "release/6.0"],
1423+
"branch": ["main", "release/6.0", "release/6.1"],
14241424
"job": ["source-compat"]
14251425
},
14261426
{
14271427
"issue": "rdar://83373628",
14281428
"platform": "Linux",
14291429
"compatibility": "4.0",
1430-
"branch": ["main", "release/5.6", "release/5.7", "release/5.8", "release/5.9", "release/5.10", "release/6.0"],
1430+
"branch": ["main", "release/6.0", "release/6.1"],
14311431
"job": ["source-compat"]
14321432
}
14331433

@@ -1639,7 +1639,7 @@
16391639
"issue": "https://github.com/apple/swift/issues/64251",
16401640
"platform": "Linux",
16411641
"compatibility": ["5.0", "4.2"],
1642-
"branch": ["main", "release/5.9", "release/5.10", "release/6.0"],
1642+
"branch": ["main", "release/6.0", "release/6.1"],
16431643
"job": ["source-compat"]
16441644
}
16451645
]
@@ -1866,7 +1866,7 @@
18661866
"issue": "rdar://83373864",
18671867
"platform": "Linux",
18681868
"compatibility": "4.2",
1869-
"branch": ["main", "release/5.6", "release/5.7", "release/5.8", "release/5.9", "release/5.10", "release/6.0"],
1869+
"branch": ["main", "release/6.0", "release/6.1"],
18701870
"job": ["source-compat"]
18711871
}
18721872
]
@@ -2010,7 +2010,7 @@
20102010
{
20112011
"issue": "https://github.com/apple/swift/issues/65197",
20122012
"compatibility": ["4.2", "5.0"],
2013-
"branch": ["main", "release/5.9", "release/5.8", "release/5.10", "release/6.0"],
2013+
"branch": ["main", "release/6.0", "release/6.1"],
20142014
"job": ["source-compat"]
20152015
}
20162016
]
@@ -2084,7 +2084,7 @@
20842084
{
20852085
"issue": "https://github.com/apple/swift/issues/65197",
20862086
"compatibility": ["4.0", "5.0"],
2087-
"branch": ["main", "release/5.9", "release/5.8", "release/5.10", "release/6.0"],
2087+
"branch": ["main", "release/6.0", "release/6.1"],
20882088
"job": ["source-compat"]
20892089
}
20902090
]
@@ -2127,7 +2127,7 @@
21272127
{
21282128
"issue": "https://github.com/apple/swift/issues/65204",
21292129
"compatibility": ["4.2", "5.0"],
2130-
"branch": ["main", "release/5.9", "release/5.8", "release/5.10", "release/6.0"],
2130+
"branch": ["main", "release/6.0", "release/6.1"],
21312131
"job": ["source-compat"]
21322132
}
21332133
]
@@ -2402,7 +2402,7 @@
24022402
{
24032403
"issue": "https://github.com/apple/swift/issues/70744",
24042404
"compatibility": ["4.0", "5.0"],
2405-
"branch": ["main", "release/5.9", "release/5.10", "release/6.0"],
2405+
"branch": ["main", "release/6.0", "release/6.1"],
24062406
"job": ["source-compat"],
24072407
"platform": "Darwin"
24082408
}
@@ -2731,7 +2731,7 @@
27312731
{
27322732
"issue": "https://github.com/apple/swift/issues/61615",
27332733
"compatibility": ["4.2", "5.0"],
2734-
"branch": ["main", "release/5.5", "release/5.6", "release/5.7", "release/5.8", "release/5.9", "release/5.10", "release/6.0"],
2734+
"branch": ["main", "release/5.5", "release/6.0", "release/6.1"],
27352735
"job": ["source-compat"],
27362736
"configuration": "debug"
27372737
}
@@ -3164,7 +3164,7 @@
31643164
{
31653165
"issue": "https://github.com/apple/swift/issues/61616",
31663166
"compatibility": ["4.0", "4.2"],
3167-
"branch": ["main", "release/5.5", "release/5.6", "release/5.7", "release/5.8", "release/5.9", "release/5.10", "release/6.0"],
3167+
"branch": ["main", "release/6.0", "release/6.1"],
31683168
"job": ["source-compat"],
31693169
"configuration": "debug"
31703170
}
@@ -3202,7 +3202,7 @@
32023202
"issue": "rdar://83374141",
32033203
"platform": "Linux",
32043204
"compatibility": "5.0",
3205-
"branch": ["main", "release/5.6", "release/5.7", "release/5.8", "release/5.9", "release/5.10", "release/6.0"],
3205+
"branch": ["main", "release/6.0", "release/6.1"],
32063206
"job": ["source-compat"]
32073207
}
32083208
]
@@ -3670,7 +3670,7 @@
36703670
{
36713671
"issue": "https://github.com/apple/swift/issues/65202",
36723672
"compatibility": ["5.0"],
3673-
"branch": ["main", "release/5.9", "release/5.8", "release/5.10", "release/6.0"]
3673+
"branch": ["main", "release/6.0", "release/6.1"]
36743674
}
36753675
]
36763676
},
@@ -4127,7 +4127,7 @@
41274127
{
41284128
"issue": "https://github.com/apple/swift/issues/65197",
41294129
"compatibility": ["4.0", "4.2", "5.0"],
4130-
"branch": ["main", "release/5.9", "release/5.8", "release/5.10", "release/6.0"],
4130+
"branch": ["main", "release/6.0", "release/6.1"],
41314131
"job": ["source-compat"]
41324132
}
41334133
]
@@ -4246,7 +4246,7 @@
42464246
{
42474247
"issue": "https://github.com/apple/swift/issues/57431",
42484248
"compatibility": ["5.0"],
4249-
"branch": ["main", "release/5.5", "release/5.6", "release/5.7", "release/5.8", "release/5.9", "release/5.10", "release/6.0"],
4249+
"branch": ["main", "release/6.0", "release/6.1"],
42504250
"job": ["source-compat"]
42514251
}
42524252
]
@@ -4501,15 +4501,7 @@
45014501
"action": "BuildSwiftPackage",
45024502
"build_tests": "true",
45034503
"configuration": "release",
4504-
"tags": "sourcekit-disabled swiftpm",
4505-
"xfail": [
4506-
{
4507-
"issue": "rdar://139409616",
4508-
"compatibility": ["5.10"],
4509-
"branch": ["release/5.10"],
4510-
"job": ["source-compat"]
4511-
}
4512-
]
4504+
"tags": "sourcekit-disabled swiftpm"
45134505
}
45144506
]
45154507
},
@@ -4989,7 +4981,7 @@
49894981
{
49904982
"issue": "https://github.com/swiftlang/swift/issues/75656",
49914983
"compatibility": ["5.10"],
4992-
"branch": ["main", "release/6.0", "release/5.10"],
4984+
"branch": ["main", "release/6.0", "release/6.1"],
49934985
"configuration": "debug",
49944986
"job": ["source-compat"]
49954987
}
@@ -5048,7 +5040,7 @@
50485040
{
50495041
"issue": "https://github.com/apple/swift/issues/57431",
50505042
"compatibility": ["5.0"],
5051-
"branch": ["main", "release/5.5", "release/5.6", "release/5.7", "release/5.8", "release/5.9", "release/5.10", "release/6.0"],
5043+
"branch": ["main", "release/6.0", "release/6.1"],
50525044
"configuration": "debug",
50535045
"job": ["source-compat"]
50545046
}
@@ -5163,7 +5155,7 @@
51635155
{
51645156
"issue": "https://github.com/swiftlang/swift/issues/75499",
51655157
"compatibility": ["5.3"],
5166-
"branch": ["main", "release/6.0"],
5158+
"branch": ["main", "release/6.0", "release/6.1"],
51675159
"platform": "Linux",
51685160
"job": ["source-compat"]
51695161
}

‎sourcekit-xfails.json

-72
Original file line numberDiff line numberDiff line change
@@ -703,18 +703,6 @@
703703
],
704704
"issueUrl" : "https://github.com/apple/swift/issues/60192"
705705
},
706-
{
707-
"path" : "*\/ACHNBrowserUI\/ACHNBrowserUI\/ACHNBrowserUI\/views\/turnips\/charts\/TurnipsChart.swift",
708-
"modification" : "insideOut-177",
709-
"issueDetail" : {
710-
"kind" : "codeComplete",
711-
"offset" : 131
712-
},
713-
"applicableConfigs" : [
714-
"main", "release/6.0", "release/5.10"
715-
],
716-
"issueUrl" : "https://github.com/apple/swift/issues/60192"
717-
},
718706
{
719707
"path" : "*\/MovieSwift\/MovieSwift\/MovieSwift\/views\/components\/discover\/DraggableCover.swift",
720708
"modification" : "insideOut-231",
@@ -753,18 +741,6 @@
753741
],
754742
"issueUrl" : "https://github.com/apple/swift/issues/60192"
755743
},
756-
{
757-
"path" : "*\/ACHNBrowserUI\/ACHNBrowserUI\/ACHNBrowserUI\/views\/turnips\/charts\/TurnipsChart.swift",
758-
"modification" : "insideOut-177",
759-
"issueDetail" : {
760-
"kind" : "conformingMethodList",
761-
"offset" : 131
762-
},
763-
"applicableConfigs" : [
764-
"main", "release/6.0", "release/5.10"
765-
],
766-
"issueUrl" : "https://github.com/apple/swift/issues/60192"
767-
},
768744
{
769745
"path" : "*\/ACHNBrowserUI\/ACHNBrowserUI\/ACHNBrowserUI\/views\/categories\/CategoriesView.swift",
770746
"modification" : "unmodified",
@@ -5580,54 +5556,6 @@
55805556
],
55815557
"issueUrl" : "https://github.com/apple/swift/issues/71728"
55825558
},
5583-
{
5584-
"path" : "*\/MovieSwift\/MovieSwift\/Shared\/flux\/actions\/MoviesActions.swift",
5585-
"modification" : "concurrent-634",
5586-
"issueDetail" : {
5587-
"kind" : "cursorInfo",
5588-
"offset" : 629
5589-
},
5590-
"applicableConfigs" : [
5591-
"main", "release/6.0"
5592-
],
5593-
"issueUrl" : "https://github.com/apple/swift/issues/72852"
5594-
},
5595-
{
5596-
"path" : "*\/MovieSwift\/MovieSwift\/Shared\/flux\/actions\/MoviesActions.swift",
5597-
"modification" : "concurrent-1569",
5598-
"issueDetail" : {
5599-
"kind" : "cursorInfo",
5600-
"offset" : 1564
5601-
},
5602-
"applicableConfigs" : [
5603-
"main", "release/6.0"
5604-
],
5605-
"issueUrl" : "https://github.com/apple/swift/issues/72852"
5606-
},
5607-
{
5608-
"path" : "*\/MovieSwift\/MovieSwift\/Shared\/flux\/actions\/PeopleActions.swift",
5609-
"modification" : "concurrent-496",
5610-
"issueDetail" : {
5611-
"kind" : "cursorInfo",
5612-
"offset" : 491
5613-
},
5614-
"applicableConfigs" : [
5615-
"main", "release/6.0"
5616-
],
5617-
"issueUrl" : "https://github.com/apple/swift/issues/72852"
5618-
},
5619-
{
5620-
"path" : "*\/MovieSwift\/MovieSwift\/Shared\/flux\/actions\/PeopleActions.swift",
5621-
"modification" : "concurrent-1147",
5622-
"issueDetail" : {
5623-
"kind" : "cursorInfo",
5624-
"offset" : 1142
5625-
},
5626-
"applicableConfigs" : [
5627-
"main", "release/6.0"
5628-
],
5629-
"issueUrl" : "https://github.com/apple/swift/issues/72852"
5630-
},
56315559
{
56325560
"path" : "*\/Base64CoderSwiftUI\/Base64CoderSwiftUI\/Model.swift",
56335561
"modification" : "unmodified",

0 commit comments

Comments
 (0)