From c871ca0ebb99fc5851fe7250252fb1dc9d232c89 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 2 Oct 2025 09:49:35 -1000 Subject: [PATCH] ;tools:just: drop the nightly tag, use a github nightly branch again It's simpler. --- Justfile | 22 ++++++++++------------ doc/RELEASING.md | 1 - doc/ghnightlynotes.md | 7 ++----- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Justfile b/Justfile index cd7a03e25..afbec285c 100644 --- a/Justfile +++ b/Justfile @@ -1079,21 +1079,19 @@ devtag-push: echo "Consider also: with $RELVER installed, ./Shake cmddocs -c" # XXX There's a tag and a github prerelease, both named nightly, creating confusion. +# Try replacing the tag with a github nightly branch again. -# After release: point the nightly tag at the release and push the tag. -@nightlytag-push: - git tag -f nightly $(just relver) - git push -f origin nightly +# # After release: point the nightly tag at the release and push the tag. +# @nightlytag-push: +# git tag -f nightly $(just relver) +# git push -f origin nightly -# XXX Ideally we'd like to adjust and push the nightly tag only after a successful build and push of new binaries. -# Between releases: push master to github, then point the nightly tag there, push the tag, and start building new platform binaries. (Until builds succeed, the tag will be wrong.) -master-nightlyrel-push: +# Between releases: push HEAD to github nightly branch and start building new platform binaries. +nightlybin: #!/usr/bin/env bash set -euo pipefail - just push - git tag -f nightly master - git push -f origin nightly - git push -f origin master:binaries + git push -f origin HEAD:nightly + git push -f origin HEAD:binaries echo "When binaries have built successfully, run just nightlyrel-bin-copy" # Browse the github nightly prerelease. @@ -1104,7 +1102,7 @@ master-nightlyrel-push: @nightlyrel-notes: gh release edit nightly -F doc/nightlynotes.md -# After building platform binaries (ghbin), copy them to the github nightly prerelease. +# After building nightly binaries (nightlybin), copy them to the github nightly prerelease. @nightlyrel-bin-copy: gh workflow run nightly diff --git a/doc/RELEASING.md b/doc/RELEASING.md index 79a428f0e..1f4f62ca5 100644 --- a/doc/RELEASING.md +++ b/doc/RELEASING.md @@ -161,7 +161,6 @@ It should be improved each time it is used. - github nightly release updated in master, update changes link in doc/ghnightlynotes.md `just nightlyrel-notes` - `just nightlytag-push` - install instructions tested and working - stack - cabal diff --git a/doc/ghnightlynotes.md b/doc/ghnightlynotes.md index fbf73a01a..2f655c20e 100644 --- a/doc/ghnightlynotes.md +++ b/doc/ghnightlynotes.md @@ -1,8 +1,7 @@ Here you can find unreleased "nightly" binaries, which are updated occasionally. By using these and providing [feedback](https://hledger.org/support.html), you can help to make the next release better. -These binaries have the following changes since the 1.50.1 release: https://github.com/simonmichael/hledger/compare/1.50.1...binaries - - +These binaries have the following changes since the 1.50.2 release: https://github.com/simonmichael/hledger/compare/1.50.2...nightly +
@@ -22,8 +21,6 @@ If you have [eget](https://github.com/zyedidia/eget), that's a convenient way to ``` eget simonmichael/hledger --pre-release --all ``` - - Otherwise: