From 8e79d47a73cf1c5ec28ef12b5cf74d659fa87454 Mon Sep 17 00:00:00 2001
From: Zach Langbert <zach.langbert@gmail.com>
Date: Sun, 12 Jan 2025 13:53:56 -0800
Subject: [PATCH] release: prepare 0.9.3 (#64)

* fix release script race condition

* release: prepare release 0.9.3
---
 custom_components/daikinone/manifest.json |  2 +-
 justfile                                  | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/custom_components/daikinone/manifest.json b/custom_components/daikinone/manifest.json
index 0dbc745..6b7301c 100644
--- a/custom_components/daikinone/manifest.json
+++ b/custom_components/daikinone/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://github.com/zlangbert/ha-daikinone",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/zlangbert/ha-daikinone/issues",
-  "version": "0.9.2"
+  "version": "0.9.3"
 }
diff --git a/justfile b/justfile
index d07f47c..e77abf1 100644
--- a/justfile
+++ b/justfile
@@ -19,7 +19,16 @@ release version:
     @gh pr create --title "release: prepare {{version}}" --body "Prepare release {{version}}" --base main
 
     # Merging PR
-    @gh pr merge --auto --delete-branch
+    @gh pr merge --auto --squash --delete-branch
+
+    # Wait for GitHub to finish processing
+    @sleep 10
 
     # Creating release
     @gh release create v{{version}} --generate-notes
+
+    # Switching back to main branch
+    @git checkout main
+
+    # Deleting the local release prep branch
+    @git branch -D release-prep-{{version}}