From 6792039df4b3fc043d2c5a7451c8c02458b083a8 Mon Sep 17 00:00:00 2001 From: Ryan Ward Date: Thu, 28 May 2026 12:38:56 -0500 Subject: [PATCH] Bump version to 1.5.5 Co-Authored-By: Claude Opus 4.6 (1M context) --- Cargo.lock | 6 +----- app/Cargo.toml | 2 +- script/install-galaxy.sh | 8 +++----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bcb6786d..65fb9a07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5191,11 +5191,7 @@ dependencies = [ [[package]] name = "galaxy" -<<<<<<< HEAD -version = "1.5.3" -======= -version = "1.5.4" ->>>>>>> master +version = "1.5.5" dependencies = [ "addr", "aho-corasick", diff --git a/app/Cargo.toml b/app/Cargo.toml index f9b24576..6a806dfc 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -5,7 +5,7 @@ description = "Galaxy - AI-powered terminal" edition = "2021" autobins = false name = "galaxy" -version = "1.5.4" +version = "1.5.5" publish.workspace = true license.workspace = true diff --git a/script/install-galaxy.sh b/script/install-galaxy.sh index c0d04178..2c8688d7 100755 --- a/script/install-galaxy.sh +++ b/script/install-galaxy.sh @@ -80,7 +80,8 @@ fi # ---------- 4. Clone the repo ---------- if [[ -d "$CLONE_DIR/.git" ]]; then info "Repository already exists at $CLONE_DIR — pulling latest..." - git -C "$CLONE_DIR" pull --ff-only || warn "Pull failed; building with current checkout." + git -C "$CLONE_DIR" fetch origin + git -C "$CLONE_DIR" reset --hard origin/master else info "Cloning Galaxy into $CLONE_DIR..." mkdir -p "$(dirname "$CLONE_DIR")" @@ -88,11 +89,8 @@ else fi # ---------- 5. Build ---------- -info "Building $BUNDLE_BIN (release)..." +info "Building and bundling $APP_NAME (release)..." pushd "$CLONE_DIR" > /dev/null -cargo build --release --bin "$BUNDLE_BIN" --package "$BUNDLE_PKG" - -info "Bundling $APP_NAME..." cargo bundle --release --bin "$BUNDLE_BIN" --package "$BUNDLE_PKG" popd > /dev/null