Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1d70d51

Browse files
committedApr 23, 2019
docs: update change log
1 parent bfb5f4a commit 1d70d51

File tree

1 file changed

+21
-25
lines changed

1 file changed

+21
-25
lines changed
 

‎CONTRIBUTING.md

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -112,55 +112,51 @@ npm --no-git-tag-version version [version] --allow-same-version -m "release: cut
112112
```
113113
NOTE: Check the changelog!!!
114114

115-
7. Create release-branch with change log
115+
4. Create release-branch with change log
116116
```
117117
git checkout -b release-[version]
118118
```
119-
120-
7. Add changes
119+
5. Add changes
121120
```
122121
git add changed-files
123122
git commit -m "release: cut the %s release"
124123
git push
125124
```
126-
8. Create git tag version with format 0.22.3
127-
```
128-
git tag version
129-
git push --tags
130-
```
131-
9. Create a pull request from git in web or try to use script below. Be careful to base your branch on the correct "release" branch
132-
```
133-
curl -d '{"title": "release: cut the [version] release","body": "docs: update changelog","head": "[BRANCH]","base": "release"}' -X POST https://api.github.com/repos/NativeScript/nativescript-dev-webpack/pulls -H "Authorization: token ${GIT_TOKEN}"
134-
```
135-
10. Merge PR into release branch.
125+
NOTE: Make sure the PR is based on release branch
136126

137-
11. If all checks has passed publish package. Usually the night builds will be triggered and the package will be ready to be released on the next day.
138-
12. Don't forget to tag the release branch
127+
6. Merge PR into release branch.
128+
129+
7. The merge will produce package with rc tag in npm. If all checks have passed, publish official package. Usually the night builds will be triggered and the package will be ready to be released on the next day.
130+
131+
8. Don't forget to tag the release branch
139132
```
140133
git tag [version]
141-
git push tags
134+
git push --tags
142135
```
143-
Tips to remove tags:
136+
Only if needed to Tips to remove tags:
144137
```
145138
git push --delete origin [version]
146139
git tag -d [version]
147140
```
148141

142+
## Checkout master branch and bump version usually should be minor or major.
143+
149144
## Merge changes from release into master
150145

146+
## NOTE: Don't use git IDE/WEB
147+
151148
![](./merge-guidance-schema.png)
152149

153150
### Here are steps described in the diagram above.
154151

155152
1. Make sure you are in release branch:
156153
```
157-
git checkout release
158-
git pull
154+
git checkout release && git pull
159155
```
160156
2. Create PR to merge changes back in master and preserve history:
161157
```
162-
git checkout -b merge-release-in-master-branch
163-
git push --set-upstream origin merge-release-in-master-branch
158+
git checkout -b merge-release-in-master-[branch]/[sha]
159+
git push --set-upstream origin merge-release-in-master-branch-[branch]/[sha]
164160
git merge origin/master
165161
```
166162
3. Resolve conflicts. Choose to keep the version of master branch. If it is needed to revert versions of modules, see at the bottom.
@@ -175,15 +171,15 @@ git commit
175171
git push
176172
```
177173

178-
6. Create pull request. Replace replace env merge-release-in-master-branch with its value
174+
6. Create pull request which should be based on master. Replace replace env merge-release-in-master-branch with its value
179175
```
180176
curl -d '{"title": "chore: merge release in master","body": "chore: merge release in master","head": "merge-release-in-master","base": "master"}' -X POST https://api.github.com/repos/NativeScript/NativeScript/pulls -H "Authorization: token ${GIT_TOKEN}"
181177
```
182178

183-
**If needed, revert version of modules and platform declarations to take the one from master:**
179+
**If needed, to revert file and take it from master:**
184180
```
185-
git checkout origin/master nativescript-angular/package.json
181+
git checkout origin/master nativescript-angular/[some-file]
186182
git commit --amend
187183
git push --force-with-lease
188184
```
189-
This will require to repeat steps from 1 to 4, since we need to keep the branches with the same history
185+
This could require to repeat steps from 1 to 4, since we need to keep the branches with the same history

0 commit comments

Comments
 (0)
Please sign in to comment.