Skip to content

Commit

Permalink
Resolve bug resulting in failing to push tags to origin
Browse files Browse the repository at this point in the history
Added additional steps to documentation for further clarification

Co-authored-by: Marco Franssen <marco.franssen@philips.com>
Signed-off-by: Brend Smits <brend.smits@philips.com>
  • Loading branch information
Brend-Smits and marcofranssen committed Nov 12, 2021
1 parent 33ba3da commit a93f24e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,16 @@ gh-release: ## Creates a new release by creating a new tag and pushing it
@git add .
@git commit -s -m "Bump $(OLD_VERSION) to $(NEW_VERSION) for release"
@git tag -sam "$(DESCRIPTION)" $(NEW_VERSION)
@git push $(NEW_VERSION)
@git push origin $(NEW_VERSION)
@echo
@echo ATTENTION: MANUAL ACTION REQUIRED!! -- Wait for the release workflow to finish
@echo
@echo Check status here https://github.com/philips-labs/slsa-provenance-action/actions/workflows/ci.yaml
@echo
@echo Once finished, push the main branch using 'git push'
@echo
@echo Visit https://github.com/philips-labs/slsa-provenance-action/releases
@echo Edit the release and save it to publish to GitHub Marketplace.
@echo
@git stash pop

7 changes: 6 additions & 1 deletion release.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ make gh-release NEW_VERSION=v0.6.0 OLD_VERSION=v0.5.0 DESCRIPTION="A test releas
`OLD_VERSION` the current version you wish to replace in the markdown and yaml files.
`DESCRIPTION` the annotation used when tagging the release.

Visit <https://github.com/philips-labs/slsa-provenance-action/releases>.
Edit the release and save it to publish to GitHub Marketplace.

### ⚠ Important alert for MacOS users ⚠

On MacOS `sed` has different behaviour and therefore doesn't work out of the box.
Expand All @@ -27,5 +30,7 @@ echo "alias sed=gsed" >> ~/.zshrc
1. Upgrade version number in all repository files, find & replace previous version number with new version number.
1. Commit the changed files.
1. Tag the new commit using `git tag -sam "What is this release about?" v0.1.0`.
1. Push the tag to remote using `git push v0.1.0`
1. Push the tag to remote using `git push origin v0.1.0`
1. Wait for the release workflow to finish, then push the main branch using `git push`
1. Visit <https://github.com/philips-labs/slsa-provenance-action/releases>.
1. Edit the release and save it to publish to GitHub Marketplace.

0 comments on commit a93f24e

Please sign in to comment.