|
1 | 1 | # com.intellij.platform:kotlinx-coroutines-* release
|
2 | 2 |
|
| 3 | +`master` branch is the upstream `master` with all the patches applied. |
| 4 | + |
3 | 5 | ```
|
4 | 6 | # update branches
|
5 | 7 | # git remote add upstream https://github.com/Kotlin/kotlinx.coroutines.git
|
6 | 8 | git checkout master
|
7 | 9 | git fetch upstream
|
8 | 10 | git fetch origin
|
9 | 11 |
|
10 |
| -# prepare new master with patches |
| 12 | +# if new patch commits need to be cherry-picked without main library version upgrade, cherry-pick them to master branch |
| 13 | +
|
| 14 | +# if library version has changed, reapply all the patches on new upstream master |
| 15 | +# update intellij/patch-base |
| 16 | +git checkout intellij/patch-base |
| 17 | +git rebase upstream/master |
| 18 | +# apply patches to new master |
| 19 | +git checkout master |
11 | 20 | git reset --hard upstream/master
|
12 | 21 | git rebase intellij/patch-base
|
13 |
| -git rebase intellij/whatever-patches-we-have, see IntelliJ-patches.md for the list of branches |
| 22 | +# also rebase patch branches on top of new intellij/patch-base[, maybe squash them for cherry-pick], then cherry-pick the patches |
| 23 | +git cherry-pick <patch commits from intellij/whatever-patches-we-have>, see IntelliJ-patches.md of the last published version for the list of patches |
| 24 | +git push origin master --force |
14 | 25 |
|
15 |
| -# Remember to change the version in `gradle.properties` to something like `1.8.4-intellij-SNAPSHOT` |
| 26 | +# prepare a release branch from the master branch |
| 27 | +git checkout -b release/<version>, e.g., release/1.8.0-intellij-6 |
| 28 | +# change the version in `gradle.properties`, e.g., to 1.8.0-intellij-6 |
16 | 29 | # commit version change
|
17 |
| -
|
18 |
| -git push origin master --force |
| 30 | +git push origin release/<version> |
19 | 31 | ```
|
20 | 32 |
|
21 | 33 | ---
|
|
0 commit comments