Minor updates to release script / guide

This commit is contained in:
Benjamin Doherty
2021-04-16 12:11:43 -07:00
parent 5f00e715ea
commit 98fd95440f
2 changed files with 8 additions and 6 deletions

View File

@@ -39,7 +39,7 @@ build/common/bump-version.sh $RELEASE
Commit changes to main with the title:
```
Bump version to $RELEASE
Release Filament $RELEASE
```
Do not push to origin yet.
@@ -106,7 +106,9 @@ git push origin release
Use the GitHub UI to create a GitHub release corresponding to $RELEASE version.
Make sure the target is set to the release branch.
## 7. Delete the old rc branch.
## 7. Delete the old rc branch (optional).
This step is optional. The old rc branch may be left alive for a few weeks for posterity.
```
git push origin --delete rc/$RELEASE
@@ -134,5 +136,5 @@ git push origin main
## 10. Push the new rc branch.
```
git push origin rc/$NEXT_RELEASE
git push origin -u rc/$NEXT_RELEASE
```

View File

@@ -134,7 +134,7 @@ git commit --amend -C HEAD
####################################################################################################
git checkout main
git branch --track "${NEW_RC_BRANCH}"
git branch "${NEW_RC_BRANCH}"
####################################################################################################
# Delete the old release candidate branch
@@ -154,7 +154,7 @@ if [[ "${PUSH_CHANGES}" == "true" ]]; then
git push origin --delete "${RC_BRANCH}"
# Push the new rc branch
git push origin "${NEW_RC_BRANCH}"
git push origin -u "${NEW_RC_BRANCH}"
else
echo ""
echo "Done."
@@ -164,7 +164,7 @@ else
echo "---------------------------------------------------------"
echo "git push origin release"
echo "git push origin --delete ${RC_BRANCH}"
echo "git push origin ${NEW_RC_BRANCH}"
echo "git push origin -u ${NEW_RC_BRANCH}"
echo "---------------------------------------------------------"
echo "Or, to undo everything:"
echo "---------------------------------------------------------"