From 3647cc967c78ae73a5f7d5a42c55f57b421d7543 Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Fri, 29 Jan 2021 12:09:40 +1100 Subject: [PATCH] docs(releasing): Update steps to fix broken releases --- RELEASING.md | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index f8a15b084..502e0015f 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -61,8 +61,28 @@ determine if npm has a version that doesn't exist in the master branch. If this has happened, you will need to manually put the release commit in. ``` -npm run release # This tags, commits and updates the changelog only +# First delete the new tag +# somehow this ends up in the repository +# even though the push fails. + +git checkout master +git pull --tags +git tag -d +git push -delete origin + + +# If there are changes that introduce features, then you'll have to branch and probably rebase + +# Now create a new commit + tag for the version: +npm run release + +# Push that tag + commit +git push origin master --follow-tags + ``` +- Don't forget to create a new release in github. + Depending on the nature of the new commits to master after the release, you -may need to rebase them on top of the tagged release commit and force push. +may need to rebase them on top of the tagged release commit and force push (only do this +if the released version would be different to the version tagged by `npm run release`)