Skip to content

Commit 0f07c42

Browse files
committed
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.
1 parent 0f9f0a4 commit 0f07c42

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Diff for: README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ A pair of corresponding branches are expected to build successfully together and
4545
To integrate the latest changes in apple/swift-experimental-string-processing to apple/swift, carefully follow the workflow:
4646

4747
- Create pull requests.
48-
- Create a pull request in apple/swift-experimental-string-processing from `main` to `swift/main`, e.g. "[Integration] main -> swift/main".
49-
- 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.
48+
- Create a branch from a commit on `main` that you would like to integrate into `swift/main`.
49+
- Create a pull request in apple/swift-experimental-string-processing from that branch to `swift/main`, e.g. "[Integration] main (<commit>) -> swift/main".
50+
- 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.
5051
- Trigger CI.
5152
- In the apple/swift-experimental-string-processing pull request, trigger CI using the following command (replacing `<PR NUMBER>` with the apple/swift pull request number, if any):
5253
```

0 commit comments

Comments
 (0)