unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [PATCH 2/6] build-system: remove calls to git-buildpackage and dput in release target.
Date: Mon,  4 Jul 2011 09:03:37 -0300	[thread overview]
Message-ID: <1309781021-32062-3-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1309781021-32062-1-git-send-email-david@tethera.net>

From: David Bremner <bremner@debian.org>

The removed code had the following issues:

- It depends on the users git-buildpackage configuration to put the
results in the correct place, so is fragile.

- The tar file is overwritten in the next step, so copying it is not
  useful.

- We should build the final version of the debian package in a chroot,
  using e.g. pbuilder or sbuild.

I added a call to "make clean", so that we are sure the code is
completely rebuilt before testing.
---
 Makefile.local |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/Makefile.local b/Makefile.local
index 41feeb3..dea813c 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -87,18 +87,13 @@ dist: $(TAR_FILE)
 .PHONY: release
 release: verify-source-tree-and-version
 	$(MAKE) VERSION=$(VERSION) verify-newer
+	$(MAKE) VERSION=$(VERSION) clean
 	$(MAKE) VERSION=$(VERSION) test
-	rm -rf ./debian-build
-	git-buildpackage
-	cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz
 	$(MAKE) VERSION=$(VERSION) $(GPG_FILE)
 	scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
 	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
-	(cd debian-build; dput *.changes)
-	mv debian-build/* releases
-	rmdir debian-build
 	git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
 	git push origin $(VERSION)
 	$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
-- 
1.7.5.4

  parent reply	other threads:[~2011-07-04 12:04 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-04 12:03 Proposed changes to release target david
2011-07-04 12:03 ` [PATCH 1/6] build-system: replace use of ssh with wget for checking the website david
2011-07-04 12:03 ` david [this message]
2011-07-04 12:03 ` [PATCH 3/6] build-system: tag earlier in the release process david
2011-07-04 12:03 ` [PATCH 4/6] build-system: use signed tag to make tar file, if available david
2011-07-04 12:03 ` [PATCH 5/6] build-system: Use existing signed tag for release, if present david
2011-07-04 12:03 ` [PATCH 6/6] build-system: guard parts irrevokable parts of release target with REALLY_UPLOAD david

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1309781021-32062-3-git-send-email-david@tethera.net \
    --to=david@tethera.net \
    --cc=bremner@debian.org \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).