From 0f07c42765f15b0fe39158b2f71b7a3963ea8970 Mon Sep 17 00:00:00 2001 From: Richard Wei Date: Thu, 17 Mar 2022 18:22:06 -0700 Subject: [PATCH] Clarify integration process. - Require creating an branch from a commit on main instead of merging from main, as main is moving constantly. - Require creating a dummy PR in apple/swift before we have full CI in this repo. --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f9882f97b..69c545243 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,9 @@ A pair of corresponding branches are expected to build successfully together and To integrate the latest changes in apple/swift-experimental-string-processing to apple/swift, carefully follow the workflow: - Create pull requests. - - Create a pull request in apple/swift-experimental-string-processing from `main` to `swift/main`, e.g. "[Integration] main -> swift/main". - - If apple/swift needs to be modified to work with the latest `main` in apple/swift-experimental-string-processing, create a pull request in apple/swift. + - Create a branch from a commit on `main` that you would like to integrate into `swift/main`. + - Create a pull request in apple/swift-experimental-string-processing from that branch to `swift/main`, e.g. "[Integration] main () -> swift/main". + - If apple/swift needs to be modified to work with the latest `main` in apple/swift-experimental-string-processing, create a pull request in apple/swift. **Note:** Since CI in apple/swift-experimental-string-processing has not yet been set up to run full toolchain tests, you should create a PR in apple/swift regardless; if the integartion does not require changing apple/swift, create a dummy PR in apple/swift by changing the README and just not merge it in the end. - Trigger CI. - In the apple/swift-experimental-string-processing pull request, trigger CI using the following command (replacing `` with the apple/swift pull request number, if any): ```