Skip to content
Snippets Groups Projects
Commit 4c78ccda authored by totten's avatar totten
Browse files

Update 5.x-patch.md

parent 0dc81626
No related branches found
No related tags found
No related merge requests found
......@@ -16,14 +16,11 @@ After all the substantive PRs have been merged, prepare a new PR to bump-up the
cd ~/src/master
git checkout origin/5.X -b 5.X-bumpY
# Set the final version to `5.X.Y`
cat xml/version.xml
./tools/bin/scripts/set-version.php 5.X.Y --commit
# Add the release notes
vi release-notes.md release-notes/5.X.Y.md
git add release-notes.md release-notes/5.X.Y.md
git commit
# Import version# and notes.
import-rn
## Paste the base64 blob from spreadsheet.
## This will commit updates for `version.xml`,
## `release-notes.md`, and `release-notes/5.X.Y.md`.
```
Submit `5.X-bumpY` as a new PR.
......@@ -32,7 +29,7 @@ Use the Github GUI for final copy-editing of the notes.
## 1B: Repo updates (Abridged flow)
Plan the patchset and [generate release notes](https://docs.google.com/spreadsheets/d/1uJAiVf0IsBfY5PUarKTeztC8z6qMmtFnfLk8Gd4cJbQ/edit?usp=sharing). Then update the corresponding `5.X` branch:
Plan the patchset and prepare the [draft release notes](https://docs.google.com/spreadsheets/d/1uJAiVf0IsBfY5PUarKTeztC8z6qMmtFnfLk8Gd4cJbQ/edit?usp=sharing). Then update the corresponding `5.X` branch:
```bash
cd ~/src/master
......@@ -42,14 +39,11 @@ git checkout 5.X
git cherry-pick abcd1234abcd1234
git push origin 5.X
# Set the final version to `5.X.Y`
cat xml/version.xml
./tools/bin/scripts/set-version.php 5.X.Y --commit
# Add the release notes
vi release-notes.md release-notes/5.X.Y.md
git add release-notes.md release-notes/5.X.Y.md
git commit
# Import version# and notes.
import-rn
## Paste the base64 blob from spreadsheet.
## This will commit updates for `version.xml`,
## `release-notes.md`, and `release-notes/5.X.Y.md`.
# Push
git push origin 5.X
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment