From 246fa75a35b3ace140ddc97b45f137eea07ddd1c Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Sat, 21 Jun 2025 19:13:26 +0700
Subject: [PATCH] Create release wheel as part of normal build

Avoids the need for a separate publish
---
 qt/release/{update.sh => build.sh} |  7 +++++--
 qt/release/publish.sh              | 13 -------------
 tools/build                        |  4 +++-
 3 files changed, 8 insertions(+), 16 deletions(-)
 rename qt/release/{update.sh => build.sh} (91%)
 delete mode 100755 qt/release/publish.sh

diff --git a/qt/release/update.sh b/qt/release/build.sh
similarity index 91%
rename from qt/release/update.sh
rename to qt/release/build.sh
index ddd99c398..423638bc4 100755
--- a/qt/release/update.sh
+++ b/qt/release/build.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-test -f update.sh || {
+test -f build.sh || {
   echo "run from release folder"
   exit 1
 }
@@ -63,6 +63,9 @@ echo "Generated pyproject.toml with version $VERSION"
 # Show diff if .old file exists
 if [ -f pyproject.toml.old ]; then
     echo
-    echo "Differences from previous version:"
+    echo "Differences from previous release version:"
     diff -u --color=always pyproject.toml.old pyproject.toml || true
 fi
+
+echo "Building wheel..."
+"$UV" build --wheel --out-dir "$PROJ_ROOT/out/wheels"
diff --git a/qt/release/publish.sh b/qt/release/publish.sh
deleted file mode 100755
index 273e34953..000000000
--- a/qt/release/publish.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Get the project root (two levels up from qt/release)
-PROJ_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-
-# Use extracted uv binary
-UV="$PROJ_ROOT/out/extracted/uv/uv"
-
-rm -rf dist
-"$UV" build --wheel
-
-#UV_PUBLISH_TOKEN=$(pass show w/pypi-api-test) "$UV" publish --index testpypi
-UV_PUBLISH_TOKEN=$(pass show w/pypi-api) "$UV" publish
diff --git a/tools/build b/tools/build
index 3df9456ed..4074ff98d 100755
--- a/tools/build
+++ b/tools/build
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-set -e
+set -eo pipefail
+
 rm -rf out/wheels/*
 RELEASE=2 ./ninja wheels
+(cd qt/release && ./build.sh)
 echo "wheels are in out/wheels"