From b557cf9b4367bf892fca9b5a46e08ff064060e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Wed, 17 Mar 2021 16:45:01 +0100 Subject: [PATCH] Simplify the release process Instead of pushing to multiple remotes, push to just one. It will then sync changes to the other. --- Makefile | 14 +++----------- docs/tutor.rst | 4 +--- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index d547630..c79b33a 100644 --- a/Makefile +++ b/Makefile @@ -58,26 +58,18 @@ bundle: ## Bundle the tutor package in a single "dist/tutor" executable dist/tutor: $(MAKE) bundle -nightly: ## Create a "nightly" release - $(MAKE) tag TAG=nightly - release: test ## Create a release tag and push it to origin - $(MAKE) retag release-origin release-overhangio TAG=v$(shell make version) + $(MAKE) release-tag release-push TAG=v$(shell make version) -retag: +release-tag: @echo "=== Creating tag $(TAG)" git tag -d $(TAG) || true git tag $(TAG) -release-origin: +release-push: @echo "=== Pushing tag $(TAG) to origin" git push origin git push origin :$(TAG) || true git push origin $(TAG) -release-overhangio: - @echo "=== Pushing tag $(TAG) to overhangio" - git push overhangio - git push overhangio :$(TAG) || true - git push overhangio $(TAG) ###### Continuous integration tasks diff --git a/docs/tutor.rst b/docs/tutor.rst index 4ed7984..9cc706d 100644 --- a/docs/tutor.rst +++ b/docs/tutor.rst @@ -65,9 +65,7 @@ Releasing a new version - Bump the ``__version__`` value in ``tutor/__about__.py``. - Replace "Unreleased" by the version name and date in CHANGELOG.md. - Create a commit with the version changelog. -- ``make release`` (this assumes that there are two remotes named "origin" and "overhangio") - -After a regular push to ``master``, run ``make nightly`` to update the "nightly" tag. +- Run ``make release``: this will push to the default repo/branch for the current branch. .. _contributing: