Commit 5ca6e99
committed
docs: update contributings doc
1 parent 7eaba62 commit 5ca6e99
1 file changed
Lines changed: 18 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -225,8 +225,10 @@ git checkout release | |||
| 225 | 225 | ``` | |
| 226 | 226 | 2. Create a PR to cut the release: | |
| 227 | 227 | ``` | |
| 228 | - git checkout -b release-version | ||
| 229 | - git push --set-upstream origin release-version | ||
| 228 | + export RELEASE_VERSION=version | ||
| 229 | + export BRANCH="release-${RELEASE_VERSION}" | ||
| 230 | + git checkout -b ${BRANCH} | ||
| 231 | + git push --set-upstream origin ${BRANCH} | ||
| 230 | 232 | ``` | |
| 231 | 233 | #### Merge master in release branch or cherry-pick commits. If the commits are in release branch **skip this step**. | |
| 232 | 234 | ``` | |
@@ -266,9 +268,13 @@ git push | |||
| 266 | 268 | git tag release-version | |
| 267 | 269 | git push --tags | |
| 268 | 270 | ``` | |
| 269 | - 9. Merge PR into release branch. | ||
| 271 | + 9. Create a pull request | ||
| 272 | + ``` | ||
| 273 | + curl -d '{"title": "release: cut the ${RELEASE_VERSION} release","body": "docs: update changelog","head": "${BRANCH}","base": "release"}' -X POST https://api.github.com/repos/NativeScript/NativeScript/pulls -H "Authorization: token ${GIT_TOKEN}" | ||
| 274 | + ``` | ||
| 275 | + 10. Merge PR into release branch. | ||
| 270 | 276 | ||
| 271 | - 10. If all checks has passed publish package. | ||
| 277 | + 11. If all checks has passed publish package. | ||
| 272 | 278 | ||
| 273 | 279 | ## Merge changes from release into master | |
| 274 | 280 | ||
@@ -283,8 +289,9 @@ git pull | |||
| 283 | 289 | ``` | |
| 284 | 290 | 2. Create PR to merge changes back in master and preserve history: | |
| 285 | 291 | ``` | |
| 286 | - git checkout -b merge-release-in-master | ||
| 287 | - git push --set-upstream origin merge-release-in-master | ||
| 292 | + export MERGE_BRANCH='merge-release-in-master' | ||
| 293 | + git checkout -b ${MERGE_BRANCH} | ||
| 294 | + git push --set-upstream origin ${MERGE_BRANCH} | ||
| 288 | 295 | git merge origin/master | |
| 289 | 296 | ``` | |
| 290 | 297 | 3. Resolve conflicts. Choose to keep the version of master branch. If it is needed to revert versions of modules, see at the bottom. | |
@@ -299,6 +306,11 @@ git commit | |||
| 299 | 306 | git push | |
| 300 | 307 | ``` | |
| 301 | 308 | ||
| 309 | + 6. Create pull request | ||
| 310 | + ``` | ||
| 311 | + git curl -d '{"title": "chore: merge release in master","body": "chore: merge release in master","head": "${MERGE_BRANCH}","base": "master"}' -X POST https://api.github.com/repos/NativeScript/NativeScript/pulls -H "Authorization: token ${GIT_TOKEN}" | ||
| 312 | + ``` | ||
| 313 | + | ||
| 302 | 314 | **If needed, revert version of modules and platform declarations to take the one from master:** | |
| 303 | 315 | ``` | |
| 304 | 316 | git checkout origin/master tns-platform-declarations/package.json tns-core-modules/package.json | |
0 commit comments