Skip to content

Commit 8fe2686

Browse files
author
Zachary 'Clack' Cole
authored
Merge pull request swiftlang#213 from apple/workaround-clean-build-folder
[Workaround] Use old build system, avoid clean build issue
2 parents e10c20a + e3d7df0 commit 8fe2686

File tree

3 files changed

+123
-43
lines changed

3 files changed

+123
-43
lines changed

‎project.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ def get_build_command(self, incremental=False):
116116
+ ['CODE_SIGN_IDENTITY=',
117117
'CODE_SIGNING_REQUIRED=NO',
118118
'ENABLE_BITCODE=NO',
119-
'-UseNewBuildSystem=NO',
120119
'INDEX_ENABLE_DATA_STORE=NO',
121120
'GCC_TREAT_WARNINGS_AS_ERRORS=NO',
122121
'SWIFT_TREAT_WARNINGS_AS_ERRORS=NO'])

‎project_future.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ def get_build_command(self, incremental=False):
118118
+ ['CODE_SIGN_IDENTITY=',
119119
'CODE_SIGNING_REQUIRED=NO',
120120
'ENABLE_BITCODE=NO',
121+
'-UseNewBuildSystem=NO',
121122
'INDEX_ENABLE_DATA_STORE=NO',
122123
'GCC_TREAT_WARNINGS_AS_ERRORS=NO',
123124
'SWIFT_TREAT_WARNINGS_AS_ERRORS=NO'])

‎projects.json

Lines changed: 122 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,9 @@
166166
"branch": "master",
167167
"maintainer": "[email protected]",
168168
"compatibility": [
169-
{
170-
"version": "3.1",
171-
"commit": "189b40655da001a9599337767687857b4cf91b36"
172-
},
173169
{
174170
"version": "4.0",
175171
"commit": "189b40655da001a9599337767687857b4cf91b36"
176-
},
177-
{
178-
"version": "4.0.3",
179-
"commit": "189b40655da001a9599337767687857b4cf91b36"
180172
}
181173
],
182174
"platforms": [
@@ -185,11 +177,29 @@
185177
"actions": [
186178
{
187179
"action": "BuildSwiftPackage",
188-
"configuration": "debug"
180+
"configuration": "debug",
181+
"xfail": {
182+
"compatibility": {
183+
"4.0": {
184+
"branch": {
185+
"master": "https://bugs.swift.org/browse/SR-8234"
186+
}
187+
}
188+
}
189+
}
189190
},
190191
{
191192
"action": "TestSwiftPackage",
192-
"configuration": "debug"
193+
"configuration": "debug",
194+
"xfail": {
195+
"compatibility": {
196+
"4.0": {
197+
"branch": {
198+
"master": "https://bugs.swift.org/browse/SR-8234"
199+
}
200+
}
201+
}
202+
}
193203
}
194204
]
195205
},
@@ -492,10 +502,6 @@
492502
"path": "Deferred",
493503
"branch": "master",
494504
"compatibility": [
495-
{
496-
"version": "3.2",
497-
"commit": "190f44e8de0d949c7cdc55e3b3bd856a05b42a67"
498-
},
499505
{
500506
"version": "4.0",
501507
"commit": "190f44e8de0d949c7cdc55e3b3bd856a05b42a67"
@@ -509,7 +515,16 @@
509515
"actions": [
510516
{
511517
"action": "BuildSwiftPackage",
512-
"configuration": "release"
518+
"configuration": "release",
519+
"xfail": {
520+
"compatibility": {
521+
"4.0": {
522+
"branch": {
523+
"master": "https://bugs.swift.org/browse/SR-8234"
524+
}
525+
}
526+
}
527+
}
513528
},
514529
{
515530
"action": "BuildXcodeProjectScheme",
@@ -606,7 +621,16 @@
606621
"actions": [
607622
{
608623
"action": "BuildSwiftPackage",
609-
"configuration": "release"
624+
"configuration": "release",
625+
"xfail": {
626+
"compatibility": {
627+
"4.0": {
628+
"branch": {
629+
"master": "https://bugs.swift.org/browse/SR-8234"
630+
}
631+
}
632+
}
633+
}
610634
},
611635
{
612636
"action": "TestSwiftPackage"
@@ -1024,10 +1048,6 @@
10241048
"branch": "master",
10251049
"maintainer": "[email protected]",
10261050
"compatibility": [
1027-
{
1028-
"version": "3.0",
1029-
"commit": "0179286cd571fa49a7d95cbcafa725cba9e11207"
1030-
},
10311051
{
10321052
"version": "4.0",
10331053
"commit": "7604f91d757d888c456f75e19c00ea755d94fe8f"
@@ -1039,7 +1059,16 @@
10391059
"actions": [
10401060
{
10411061
"action": "BuildSwiftPackage",
1042-
"configuration": "release"
1062+
"configuration": "release",
1063+
"xfail": {
1064+
"compatibility": {
1065+
"4.0": {
1066+
"branch": {
1067+
"master": "https://bugs.swift.org/browse/SR-8234"
1068+
}
1069+
}
1070+
}
1071+
}
10431072
},
10441073
{
10451074
"action": "TestSwiftPackage"
@@ -1053,7 +1082,7 @@
10531082
"branch": "master",
10541083
"compatibility": [
10551084
{
1056-
"version": "4.0.3",
1085+
"version": "4.0",
10571086
"commit": "4b3ff7e7ddd87c0ce73b39b5390c045fe1a8d4af"
10581087
}
10591088
],
@@ -1064,7 +1093,16 @@
10641093
"actions": [
10651094
{
10661095
"action": "BuildSwiftPackage",
1067-
"configuration": "release"
1096+
"configuration": "release",
1097+
"xfail": {
1098+
"compatibility": {
1099+
"4.0": {
1100+
"branch": {
1101+
"master": "https://bugs.swift.org/browse/SR-8234"
1102+
}
1103+
}
1104+
}
1105+
}
10681106
},
10691107
{
10701108
"action": "TestSwiftPackage"
@@ -1078,10 +1116,6 @@
10781116
"branch": "master",
10791117
"maintainer": "[email protected]",
10801118
"compatibility": [
1081-
{
1082-
"version": "3.1",
1083-
"commit": "4c20bd99c56f6ba370faf1d014599f7149fb834d"
1084-
},
10851119
{
10861120
"version": "4.0",
10871121
"commit": "51256c161c32570267174469ac3826b7bb3da113"
@@ -1094,7 +1128,16 @@
10941128
"actions": [
10951129
{
10961130
"action": "BuildSwiftPackage",
1097-
"configuration": "release"
1131+
"configuration": "release",
1132+
"xfail": {
1133+
"compatibility": {
1134+
"4.0": {
1135+
"branch": {
1136+
"master": "https://bugs.swift.org/browse/SR-8234"
1137+
}
1138+
}
1139+
}
1140+
}
10981141
},
10991142
{
11001143
"action": "TestSwiftPackage"
@@ -1206,7 +1249,16 @@
12061249
"actions": [
12071250
{
12081251
"action": "BuildSwiftPackage",
1209-
"configuration": "release"
1252+
"configuration": "release",
1253+
"xfail": {
1254+
"compatibility": {
1255+
"3.0": {
1256+
"branch": {
1257+
"master": "https://bugs.swift.org/browse/SR-8234"
1258+
}
1259+
}
1260+
}
1261+
}
12101262
}
12111263
]
12121264
},
@@ -1270,7 +1322,7 @@
12701322
"branch": "master",
12711323
"compatibility": [
12721324
{
1273-
"version": "4.0.3",
1325+
"version": "4.0",
12741326
"commit": "fe78418de7757d100c94f702e8effb5e7b8e93b8"
12751327
}
12761328
],
@@ -1282,7 +1334,16 @@
12821334
"actions": [
12831335
{
12841336
"action": "BuildSwiftPackage",
1285-
"configuration": "release"
1337+
"configuration": "release",
1338+
"xfail": {
1339+
"compatibility": {
1340+
"4.0": {
1341+
"branch": {
1342+
"master": "https://bugs.swift.org/browse/SR-8234"
1343+
}
1344+
}
1345+
}
1346+
}
12861347
},
12871348
{
12881349
"action": "TestSwiftPackage"
@@ -1411,10 +1472,6 @@
14111472
"branch": "master",
14121473
"maintainer": "[email protected]",
14131474
"compatibility": [
1414-
{
1415-
"version": "3.0",
1416-
"commit": "ac56b87a94a4ea8b795af45012d0f89d4981919e"
1417-
},
14181475
{
14191476
"version": "4.0",
14201477
"commit": "c5273e456ef02230689f6db2172abb29901115f0"
@@ -1426,7 +1483,16 @@
14261483
"actions": [
14271484
{
14281485
"action": "BuildSwiftPackage",
1429-
"configuration": "release"
1486+
"configuration": "release",
1487+
"xfail": {
1488+
"compatibility": {
1489+
"4.0": {
1490+
"branch": {
1491+
"master": "https://bugs.swift.org/browse/SR-8234"
1492+
}
1493+
}
1494+
}
1495+
}
14301496
},
14311497
{
14321498
"action": "TestSwiftPackage"
@@ -1741,10 +1807,6 @@
17411807
"path": "Result",
17421808
"branch": "master",
17431809
"compatibility": [
1744-
{
1745-
"version": "3.1",
1746-
"commit": "1a2a979e6399dfb3574c935d6ccee36bc0214405"
1747-
},
17481810
{
17491811
"version": "4.0",
17501812
"commit": "7477584259bfce2560a19e06ad9f71db441fff11"
@@ -1758,7 +1820,16 @@
17581820
"actions": [
17591821
{
17601822
"action": "BuildSwiftPackage",
1761-
"configuration": "release"
1823+
"configuration": "release",
1824+
"xfail": {
1825+
"compatibility": {
1826+
"4.0": {
1827+
"branch": {
1828+
"master": "https://bugs.swift.org/browse/SR-8234"
1829+
}
1830+
}
1831+
}
1832+
}
17621833
},
17631834
{
17641835
"action": "TestSwiftPackage"
@@ -2197,7 +2268,16 @@
21972268
"actions": [
21982269
{
21992270
"action": "BuildSwiftPackage",
2200-
"configuration": "release"
2271+
"configuration": "release",
2272+
"xfail": {
2273+
"compatibility": {
2274+
"4.0": {
2275+
"branch": {
2276+
"master": "https://bugs.swift.org/browse/SR-8234"
2277+
}
2278+
}
2279+
}
2280+
}
22012281
},
22022282
{
22032283
"action": "TestSwiftPackage"

0 commit comments

Comments
 (0)