From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SKxRHus1EF/hGgAA0tVLHw (envelope-from ) for ; Thu, 16 Jul 2020 11:11:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +IRPGus1EF+0MwAAB5/wlQ (envelope-from ) for ; Thu, 16 Jul 2020 11:11:39 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2AB059404C7 for ; Thu, 16 Jul 2020 11:11:38 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 96F2520058; Thu, 16 Jul 2020 07:11:32 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id A44231F9F4 for ; Thu, 16 Jul 2020 07:11:29 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 85F905FFD4; Thu, 16 Jul 2020 07:11:29 -0400 (EDT) Received: (nullmailer pid 3223122 invoked by uid 1000); Thu, 16 Jul 2020 11:11:28 -0000 From: David Bremner To: David Bremner , notmuch@notmuchmail.org Subject: [PATCH] build: upload html docs as part of release process Date: Thu, 16 Jul 2020 08:11:26 -0300 Message-Id: <20200716111126.3223050-1-david@tethera.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200716110314.3219350-1-david@tethera.net> References: <20200716110314.3219350-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 74PDUBVHPJS3VLQPYHWNND3CUTQWTKFM X-Message-ID-Hash: 74PDUBVHPJS3VLQPYHWNND3CUTQWTKFM X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 1.53 X-TUID: 0ufCYqd/NOsS Use a URL https://notmuchmail.org/doc/latest to leave room for a future more ambitious scheme deploying multiple versions. This also forces the html docs to built as part of the release process. In the future this should be updated to tolerate generating a release without sphinx installed. This needs a new target analogous to build-info and build-man that does nothing if sphinx is not installed. --- Oops. Of course as soon as I send it I see a flaw. It's hard to test this stuff without doing another release; in some sense this patch is a reminder to me to debug it next time I do a release. Makefile.global | 1 + Makefile.local | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.global b/Makefile.global index 98b6962e..4fd796e3 100644 --- a/Makefile.global +++ b/Makefile.global @@ -39,6 +39,7 @@ DEB_TAG=debian/$(UPSTREAM_TAG)-1 RELEASE_HOST=notmuchmail.org RELEASE_DIR=/srv/notmuchmail.org/www/releases +DOC_DIR=/srv/notmuchmail.org/www/doc/latest RELEASE_URL=https://notmuchmail.org/releases TAR_FILE=$(PACKAGE)-$(VERSION).tar.xz ELPA_FILE:=$(PACKAGE)-emacs-$(ELPA_VERSION).tar diff --git a/Makefile.local b/Makefile.local index 22577617..39f36d50 100644 --- a/Makefile.local +++ b/Makefile.local @@ -64,7 +64,7 @@ update-versions: # are part of the release and need to take the version from the # version file). .PHONY: release -release: verify-source-tree-and-version +release: verify-source-tree-and-version sphinx-html $(MAKE) VERSION=$(VERSION) verify-newer $(MAKE) VERSION=$(VERSION) clean $(MAKE) VERSION=$(VERSION) test @@ -80,6 +80,7 @@ ifeq ($(REALLY_UPLOAD),yes) git push origin $(VERSION) $(DEB_TAG) 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) endif @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template." -- 2.27.0