From c2f4583a12ce3d1613d8097d7574ca1bd3501fec Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 5 May 2022 20:59:18 +0100 Subject: [PATCH] Makefile, make-release: Make published version current Signed-off-by: Ian Jackson --- Makefile | 3 +++ make-release | 1 + 2 files changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 82afb902..e3244374 100644 --- a/Makefile +++ b/Makefile @@ -477,6 +477,9 @@ publish: doc-sphinx rsync -r --delete-delay docs/html/. $(PUBLISH_DOC_SPHINX)/. git branch -f $(PUBLISHED_BRANCH) +publish-make-current: + ssh $(PUBLISH_USER) 'set -e; cd $(PUBLISH_DOC_SPHINX_BASE); rm -f current.tmp; ln -s $(PUBLISH_VERSION) current.tmp; mv -T current.tmp current' + #---------- deployment ---------- DEPLOY_USER=ian@login.chiark.greenend.org.uk diff --git a/make-release b/make-release index 1a8776ba..49525e19 100755 --- a/make-release +++ b/make-release @@ -103,6 +103,7 @@ $dryrun git push origin $branch #---------- non-idempotent things ---------- $dryrun make -j12 PUBLISH_VERSION=$version publish +$dryrun make -j12 PUBLISH_VERSION=$version publish-make-current $dryrun git tag -s -u "$keyid" -m "Otter v$version" $tag $dryrun git push chiark $tag -- 2.30.2