diff options
| author | David Bremner <david@tethera.net> | 2020-12-25 12:26:35 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-12-25 12:28:31 -0400 |
| commit | d812256aeb91646b5b1c644fa67f07c483cca651 (patch) | |
| tree | 8716955e00c1fee1bfff953f250e9af666132680 | |
| parent | a103c15986f587c909a3de3fc571d2f54c65c94d (diff) | |
debian: don't tag debian tag at release is made.0.31.3
This reflects a change in the debian workflow to use dgit, which does
the tagging for us. It also leaves room for debian specific fixups.
| -rw-r--r-- | Makefile.global | 1 | ||||
| -rw-r--r-- | Makefile.local | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.global b/Makefile.global index 8477468d..fe79121d 100644 --- a/Makefile.global +++ b/Makefile.global @@ -36,7 +36,6 @@ endif endif UPSTREAM_TAG=$(subst ~,_,$(VERSION)) -DEB_TAG=debian/$(UPSTREAM_TAG)-1 RELEASE_HOST=notmuchmail.org RELEASE_DIR=/srv/notmuchmail.org/www/releases diff --git a/Makefile.local b/Makefile.local index fb126294..bbb8f0b6 100644 --- a/Makefile.local +++ b/Makefile.local @@ -73,12 +73,11 @@ release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE) ln -sf $(TAR_FILE) $(DEB_TAR_FILE) pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG) - git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG) mkdir -p releases mv $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce ifeq ($(REALLY_UPLOAD),yes) - git push origin $(VERSION) $(DEB_TAG) release pristine-tar + git push origin $(VERSION) release pristine-tar cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)" rsync --verbose --delete --recursive doc/_build/html/ $(RELEASE_HOST):$(DOC_DIR) @@ -90,7 +89,6 @@ pre-release: $(MAKE) VERSION=$(VERSION) clean $(MAKE) VERSION=$(VERSION) test git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG) - git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG) $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE) ln -sf $(TAR_FILE) $(DEB_TAR_FILE) pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG) |