Updating llvm-project swift/master branch

Development Announcements
1

We will be performing an update to the swift/master branch for apple/llvm-project repository.

We will be verifying the update on Swift CI with following platforms.

  • macOS
  • Ubuntu 16.04, 18.04, 20.04
  • CentOS 8
  • Amazon Linux 2

For those supporting other platforms if you would like to test against the swift/master merge before it lands please check out the following branches:

swift

  • master-rebranch

llvm-project:

  • LLDB: swift/master-rebranch
  • All other LLVM projects: apple/stable/20200714

Update Checkout Scheme:
./utils/update-checkout --scheme master-rebranch

Automergers

  • Swift will have an automerger from master into master-rebranch to keep the branch in sync.
  • LLVM Project will have an automerger from apple/stable/20200714 into swift/master-rebranch .
  • LLVM Project will not have automerger from swift/master into swift/master-rebranch , similar to how there’s no automerger from swift/master into swift/master-next .

Branch Detail

  • Swift master-rebranch was created from master-next on July 15th 2020.
  • LLVM Project swift/master-rebranch and apple/stable/20200714 were created from swift/master-next and apple/master on July 14th 2020.
  • LLVM Project branch apple/stable/20200714 was cut at the same point as llvm’s release/11.x branch.

I will update this topic before we perform the operation.

2 Likes
2

We are planning on doing this tomorrow (Aug 18th 2020).

1 Like
3

We are going push this out, I will provide an update once we have a new date.

4

GitHub Pull request created:

2 Likes
5

We just merged master-rebranch into master for swift, and did theirs merge from swift/master-rebranch into swift/master for llvm-project! :partying_face:

Note: This will require clean build.

2 Likes