From 277433bb88290c9b0362c5c2ece9750ff2ce0d7c Mon Sep 17 00:00:00 2001 From: Konrad `ktoso` Malawski Date: Thu, 26 Aug 2021 18:51:02 +0900 Subject: [PATCH 1/2] Re-enable distributed tracing main branch Main should be good again. Undoes https://github.com/apple/swift-source-compat-suite/pull/571 FYI @hborla @slashmo --- projects.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/projects.json b/projects.json index dba05a81..0c321a53 100755 --- a/projects.json +++ b/projects.json @@ -3516,10 +3516,6 @@ "branch": "main", "maintainer": "ktoso@apple.com", "compatibility": [ - { - "version": "5.0", - "commit": "73f2b523f0f1b04b0c58979a10fafc7860819889" - }, { "version": "5.2", "commit": "73f2b523f0f1b04b0c58979a10fafc7860819889" @@ -3538,7 +3534,7 @@ { "issue": "https://bugs.swift.org/browse/SR-15060", "compatibility": ["5.0", "5.2"], - "branch": ["main", "release/5.5"] + "branch": ["release/5.5"] } ] }, From 89fb25ad5b2946347a7fee6dfa9c6c77fcecf225 Mon Sep 17 00:00:00 2001 From: Konrad `ktoso` Malawski Date: Fri, 27 Aug 2021 11:51:07 +0900 Subject: [PATCH 2/2] Update commit that dist tracing refers to --- projects.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/projects.json b/projects.json index 0c321a53..9addc088 100755 --- a/projects.json +++ b/projects.json @@ -3518,7 +3518,7 @@ "compatibility": [ { "version": "5.2", - "commit": "73f2b523f0f1b04b0c58979a10fafc7860819889" + "commit": "7a89c904d80fd2dc7c6071806f38d5d0b2d5a1b5" } ], "platforms": [ @@ -3529,14 +3529,7 @@ { "action": "BuildSwiftPackage", "configuration": "release", - "tags": "sourcekit-disabled swiftpm", - "xfail": [ - { - "issue": "https://bugs.swift.org/browse/SR-15060", - "compatibility": ["5.0", "5.2"], - "branch": ["release/5.5"] - } - ] + "tags": "sourcekit-disabled swiftpm" }, { "action": "TestSwiftPackage"