Merge pull request #1249 from twm/release-pt-2

GHA release pipeline, pt. 2

README.md

@@ -69,8 +69,8 @@ Yarrharr is running at [http://127.0.0.1:8888/](http://127.0.0.1:8888/).
 
 ## Releasing Yarrharr
 
- 1. Bump the version number in ``yarrharr/__init__.py``.
- 2. Build and tag the release: ``just release``
+ 1. Set the version: ``incremental update yarrharr --newversion YYYY.MM.PP``
+ 2. Tag the release: ``just release``
 
 ## License
 

bin/release.sh

@@ -5,4 +5,3 @@ tox -e release --notest
 version=$(.tox/release/bin/hatch version)
 .tox/release/bin/python -m build
 .tox/release/bin/python -m twine check "dist/yarrharr-${version}.tar.gz" "dist/yarrharr-${version}-py3-none-any.whl"
-git tag "v${version}"

justfile

@@ -8,8 +8,16 @@ default:
 _static:
     tox -e static
 
-release: _static
-    bin/release.sh
+# Tag a release and trigger the GHA release workflow
+release:
+    set -exu -o pipefail
+    git diff --quiet HEAD || exit 1
+    [[ $(git rev-parse --abbrev-ref HEAD) == trunk ]]
+    version=$(.tox/release/bin/hatch version)
+    tag="v${version}"
+    git tag "$tag"
+    git push origin "$tag"
+    git push origin trunk
 
 devserver: _static
     tox -e run -- django-admin migrate