From: David Bremner <bremner@debian.org>
Date: Sun, 3 Jul 2011 20:06:05 +0000 (-0300)
Subject: build-system: tag earlier in the release process.
X-Git-Tag: 0.6.1~5
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=60173feb065a4306dc91093d886bf46475c23e11

build-system: tag earlier in the release process.

If tagging fails, we really don't want to upload tarballs.
---

diff --git a/Makefile.local b/Makefile.local
index 9b76c305..990f8204 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -90,6 +90,7 @@ release: verify-source-tree-and-version
 	$(MAKE) VERSION=$(VERSION) verify-newer
 	$(MAKE) VERSION=$(VERSION) clean
 	$(MAKE) VERSION=$(VERSION) test
+	git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
 	$(MAKE) VERSION=$(VERSION) $(GPG_FILE)
 	ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
 	pristine-tar commit $(DEB_TAR_FILE) $(VERSION)
@@ -97,7 +98,6 @@ release: verify-source-tree-and-version
 	ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
 	mkdir -p releases
 	mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
-	git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
 	git push origin $(VERSION)
 	$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
 	@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."