From 6ba4e059dc8505701ae92c67b0734df6b196e2c5 Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Thu, 1 Nov 2018 11:53:18 -0700 Subject: [PATCH] Add support for Swift 5.0 branch --- common.py | 16 +++++++-------- projects.json | 56 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/common.py b/common.py index ac3a5858e2925..597801dbff1dd 100755 --- a/common.py +++ b/common.py @@ -58,17 +58,17 @@ 'swift-corelibs-xctest': 'swift-4.2-branch', }, 'swift-5.0-branch': { - 'llvm': 'swift-4.1-branch', - 'clang': 'swift-4.1-branch', - 'compiler-rt': 'swift-4.1-branch', + 'llvm': 'swift-5.0-branch', + 'clang': 'swift-5.0-branch', + 'compiler-rt': 'swift-5.0-branch', 'swift': 'swift-5.0-branch', 'cmark': 'master', 'ninja': 'release', - 'llbuild': 'swift-4.1-branch', - 'swiftpm': 'swift-4.1-branch', - 'swift-corelibs-libdispatch': 'swift-4.1-branch', - 'swift-corelibs-foundation': 'swift-4.1-branch', - 'swift-corelibs-xctest': 'swift-4.1-branch', + 'llbuild': 'master', + 'swiftpm': 'master', + 'swift-corelibs-libdispatch': 'master', + 'swift-corelibs-foundation': 'master', + 'swift-corelibs-xctest': 'master', }, 'swift-4.0-branch': { 'llvm': 'swift-4.0-branch', diff --git a/projects.json b/projects.json index 9586783051764..7de1e596f5f76 100644 --- a/projects.json +++ b/projects.json @@ -619,7 +619,8 @@ "compatibility": { "4.2": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8307" + "master": "https://bugs.swift.org/browse/SR-8307", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8307" } } } @@ -660,7 +661,8 @@ "compatibility": { "4.0": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8307" + "master": "https://bugs.swift.org/browse/SR-8307", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8307" } }, "4.1": { @@ -720,7 +722,8 @@ "compatibility": { "4.0": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8234" + "master": "https://bugs.swift.org/browse/SR-8234", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8234" } } } @@ -756,7 +759,8 @@ "compatibility": { "4.0": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8250" + "master": "https://bugs.swift.org/browse/SR-8250", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250" } } } @@ -819,7 +823,8 @@ "compatibility": { "4.0": { "branch": { - "master": "https://bugs.swift.org/browse/SR-9146" + "master": "https://bugs.swift.org/browse/SR-9146", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-9146" } } } @@ -836,7 +841,8 @@ "compatibility": { "4.0": { "branch": { - "master": "https://bugs.swift.org/browse/SR-9146" + "master": "https://bugs.swift.org/browse/SR-9146", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-9146" } } } @@ -1016,7 +1022,8 @@ "compatibility": { "3.0": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8270" + "master": "https://bugs.swift.org/browse/SR-8270", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8270" } } } @@ -1032,7 +1039,8 @@ "compatibility": { "3.0": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8270" + "master": "https://bugs.swift.org/browse/SR-8270", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8270" } } } @@ -1193,7 +1201,8 @@ "compatibility": { "4.0": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8234" + "master": "https://bugs.swift.org/browse/SR-8234", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8234" } } } @@ -1230,7 +1239,8 @@ "compatibility": { "4.2": { "branch": { - "master": "https://bugs.swift.org/browse/SR-9102" + "master": "https://bugs.swift.org/browse/SR-9102", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-9102" } } } @@ -1327,7 +1337,8 @@ "compatibility": { "4.1": { "branch": { - "master": "https://bugs.swift.org/browse/SR-9068" + "master": "https://bugs.swift.org/browse/SR-9068", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068" } } } @@ -1343,7 +1354,8 @@ "compatibility": { "4.1": { "branch": { - "master": "https://bugs.swift.org/browse/SR-9068" + "master": "https://bugs.swift.org/browse/SR-9068", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068" } } } @@ -1359,7 +1371,8 @@ "compatibility": { "4.1": { "branch": { - "master": "https://bugs.swift.org/browse/SR-9068" + "master": "https://bugs.swift.org/browse/SR-9068", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068" } } } @@ -1375,7 +1388,8 @@ "compatibility": { "4.1": { "branch": { - "master": "https://bugs.swift.org/browse/SR-9068" + "master": "https://bugs.swift.org/browse/SR-9068", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068" } } } @@ -1388,7 +1402,8 @@ "compatibility": { "4.1": { "branch": { - "master": "https://bugs.swift.org/browse/SR-9068" + "master": "https://bugs.swift.org/browse/SR-9068", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-9068" } } } @@ -1562,7 +1577,8 @@ "compatibility": { "4.2": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8250" + "master": "https://bugs.swift.org/browse/SR-8250", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250" } } } @@ -1671,6 +1687,7 @@ "4.2": { "branch": { "master": "https://bugs.swift.org/browse/SR-9139", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-9139", "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9139" } } @@ -2154,7 +2171,8 @@ "compatibility": { "4.2": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8250" + "master": "https://bugs.swift.org/browse/SR-8250", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250" } } } @@ -2187,6 +2205,7 @@ "4.0": { "branch": { "master": "https://bugs.swift.org/browse/SR-8046", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8046", "swift-4.2-branch": "https://bugs.swift.org/browse/SR-8046" } } @@ -2689,7 +2708,8 @@ "compatibility": { "3.1": { "branch": { - "master": "https://bugs.swift.org/browse/SR-8250" + "master": "https://bugs.swift.org/browse/SR-8250", + "swift-5.0-branch": "https://bugs.swift.org/browse/SR-8250" } } }