You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+14-13Lines changed: 14 additions & 13 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,7 +8,7 @@ See [Declarative String Processing Overview][decl-string]
8
8
9
9
## Requirements
10
10
11
-
-[Swift Trunk Development Snapshot](https://www.swift.org/download/#snapshots) DEVELOPMENT-SNAPSHOT-2022-04-20 or later.
11
+
-Currently tested with [Swift Trunk Development Snapshot](https://www.swift.org/download/#snapshots) DEVELOPMENT-SNAPSHOT-2025-09-14 or later.
12
12
13
13
## Trying it out
14
14
@@ -27,7 +27,7 @@ For example, in a `Package.swift` file's target declaration:
27
27
28
28
## Integration with Swift
29
29
30
-
`_RegexParser` and `_StringProcessing` are specially integrated modules that are built as part of apple/swift.
30
+
`_RegexParser` and `_StringProcessing` are specially integrated modules that are built as part of [apple/swift](https://github.com/apple/swift).
31
31
32
32
Specifically, `_RegexParser` contains the parser for regular expression literals and is built both as part of the compiler and as a core library. `_CUnicode` and `_StringProcessing` are built together as a core library named `_StringProcessing`.
33
33
@@ -39,17 +39,14 @@ Specifically, `_RegexParser` contains the parser for regular expression literals
39
39
40
40
### Branching scheme
41
41
42
-
#### Development branch
43
-
44
42
The `main` branch is the branch for day-to-day development. Generally, you should create PRs against this branch.
45
43
46
-
#### Swift integration branches
47
-
48
44
Branches whose name starts with `swift/` are Swift integration branches similar to those in [apple/llvm-project](https://github.com/apple/llvm-project). For each branch, dropping the `swift/` prefix is the corresponding branch in [apple/swift](https://github.com/apple/swift).
49
45
46
+
This package's `main` branch automatically integrates with Swift's `main` branch.
@@ -59,11 +56,13 @@ A pair of corresponding branches are expected to build successfully together and
59
56
60
57
To integrate the latest changes in apple/swift-experimental-string-processing to apple/swift, carefully follow the workflow:
61
58
62
-
- Create pull requests.
63
-
- Create a branch from a commit on `main` that you would like to integrate into `swift/main`.
64
-
- Create a pull request in apple/swift-experimental-string-processing from that branch to `swift/main`, e.g. "[Integration] main (<commit>) -> swift/main".
65
-
- 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.
66
-
- Trigger CI.
59
+
- Run package CI
60
+
- In the pull request, trigger package CI using
61
+
```
62
+
@swift-ci please test
63
+
```
64
+
- Run full Swift CI for any changes to public or SPI interfaces or the `_RegexParser` module.
65
+
- 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 integration does not require changing apple/swift, create a dummy PR in apple/swift by changing the README and close it in the end instead of merging.
67
66
- 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):
68
67
```
69
68
apple/swift#<PR NUMBER> # use this line only if there is an corresponding apple/swift PR
@@ -75,7 +74,9 @@ To integrate the latest changes in apple/swift-experimental-string-processing to
75
74
@swift-ci please test
76
75
```
77
76
- Merge when approved.
78
-
- Merge the pull request in apple/swift-experimental-string-processing as a **merge commit**.
77
+
- Merge the PR in apple/swift-experimental-string-processing:
78
+
- as a squash or rebase if against main (the development branch).
79
+
- as a merge commit if it's a merge from main to swift/release/x.y.
0 commit comments