Release 2.2.7

Makefile

@@ -10,11 +10,23 @@
 #   make check-deps   - Verify keepkey-rust dependency linking
 #   make test-keepkey-rust - Run keepkey-rust tests
 #
+# Release workflow targets:
+#   make release-branch VERSION=2.2.6  - Create release-2.2.6 branch and update version
+#   make release-patch-branch          - Auto-increment patch version and create branch
+#   make release-minor-branch          - Auto-increment minor version and create branch
+#   make release-major-branch          - Auto-increment major version and create branch
+#
+# Version update only:
+#   make release VERSION=2.2.6   - Update version without creating branch
+#   make release-patch           - Bump patch version (X.Y.Z+1)
+#   make release-minor           - Bump minor version (X.Y+1.0)
+#   make release-major           - Bump major version (X+1.0.0)
+#
 # Dependencies:
 #   - Rust/Cargo (for keepkey-rust and Tauri backend)
 #   - Bun (for frontend dependencies)
 #   - jq (for dependency verification)
-.PHONY: all firmware kkcli rest vault-ui vault test test-rest clean keepkey-rust vault-build rebuild check-deps help
+.PHONY: all firmware kkcli rest vault-ui vault test test-rest clean keepkey-rust vault-build rebuild check-deps help release release-patch release-minor release-major release-branch release-patch-branch release-minor-branch release-major-branch
 
 # Display help information
 help:
@@ -30,6 +42,16 @@ help:
 	@echo "  check-deps    - Verify keepkey-rust dependency linking"
 	@echo "  test-keepkey-rust - Run keepkey-rust tests"
 	@echo ""
+	@echo "Release targets:"
+	@echo "  release              - Bump version across all projects (requires VERSION=x.y.z)"
+	@echo "  release-branch       - Create release branch and bump version (requires VERSION=x.y.z)"
+	@echo "  release-patch        - Bump patch version (X.Y.Z+1)"
+	@echo "  release-minor        - Bump minor version (X.Y+1.0)"
+	@echo "  release-major        - Bump major version (X+1.0.0)"
+	@echo "  release-patch-branch - Create release branch with patch version bump"
+	@echo "  release-minor-branch - Create release branch with minor version bump"
+	@echo "  release-major-branch - Create release branch with major version bump"
+	@echo ""
 	@echo "Dependencies:"
 	@echo "  - Rust/Cargo (for keepkey-rust and Tauri backend)"
 	@echo "  - Bun (for frontend dependencies)"
@@ -73,6 +95,7 @@ vault: keepkey-rust check-deps
 
 # Build vault for production
 vault-build: keepkey-rust check-deps
+    lsof -ti:1420 | xargs kill -9 \
 	@echo "🔧 Building vault-v2 for production with latest keepkey-rust..."
 	cd projects/vault-v2 && bun i && tauri build
 
@@ -93,3 +116,77 @@ rebuild: clean all
 vault-dev:
 	@echo "🚀 Quick vault-v2 development build..."
 	cd projects/vault-v2 && bun i && tauri dev
+
+# Release targets for version management
+release:
+	@chmod +x scripts/release.sh
+	@./scripts/release.sh $(VERSION)
+
+# Create release branch and update version
+release-branch:
+	@if [ -z "$(VERSION)" ]; then \
+		echo "Error: VERSION is required. Usage: make release-branch VERSION=2.2.6"; \
+		exit 1; \
+	fi
+	@echo "🔀 Creating release branch for version $(VERSION)..."
+	@git checkout -b release-$(VERSION) 2>/dev/null || (echo "⚠️  Branch release-$(VERSION) already exists, switching to it..." && git checkout release-$(VERSION))
+	@chmod +x scripts/release.sh
+	@./scripts/release.sh $(VERSION)
+	@echo "✅ Release branch release-$(VERSION) created and version updated"
+	@echo ""
+	@echo "Next steps:"
+	@echo "  1. Review changes: git diff"
+	@echo "  2. Build and test: make vault-build"
+	@echo "  3. Commit: git add . && git commit -m 'chore: release v$(VERSION)'"
+	@echo "  4. Push branch: git push -u origin release-$(VERSION)"
+	@echo "  5. Create PR to master branch"
+	@echo "  6. After merge, tag: git tag -a v$(VERSION) -m 'Release v$(VERSION)' && git push --tags"
+
+# Quick release helpers
+release-patch:
+	@CURRENT=$$(grep '"version"' projects/vault-v2/package.json | head -1 | cut -d'"' -f4); \
+	IFS='.' read -r major minor patch <<< "$$CURRENT"; \
+	NEW_PATCH=$$((patch + 1)); \
+	NEW_VERSION="$$major.$$minor.$$NEW_PATCH"; \
+	chmod +x scripts/release.sh; \
+	./scripts/release.sh $$NEW_VERSION
+
+release-minor:
+	@CURRENT=$$(grep '"version"' projects/vault-v2/package.json | head -1 | cut -d'"' -f4); \
+	IFS='.' read -r major minor patch <<< "$$CURRENT"; \
+	NEW_MINOR=$$((minor + 1)); \
+	NEW_VERSION="$$major.$$NEW_MINOR.0"; \
+	chmod +x scripts/release.sh; \
+	./scripts/release.sh $$NEW_VERSION
+
+release-major:
+	@CURRENT=$$(grep '"version"' projects/vault-v2/package.json | head -1 | cut -d'"' -f4); \
+	IFS='.' read -r major minor patch <<< "$$CURRENT"; \
+	NEW_MAJOR=$$((major + 1)); \
+	NEW_VERSION="$$NEW_MAJOR.0.0"; \
+	chmod +x scripts/release.sh; \
+	./scripts/release.sh $$NEW_VERSION
+
+# Create patch release branch (convenience wrapper)
+release-patch-branch:
+	@CURRENT=$$(grep '"version"' projects/vault-v2/package.json | head -1 | cut -d'"' -f4); \
+	IFS='.' read -r major minor patch <<< "$$CURRENT"; \
+	NEW_PATCH=$$((patch + 1)); \
+	NEW_VERSION="$$major.$$minor.$$NEW_PATCH"; \
+	$(MAKE) release-branch VERSION=$$NEW_VERSION
+
+# Create minor release branch (convenience wrapper)
+release-minor-branch:
+	@CURRENT=$$(grep '"version"' projects/vault-v2/package.json | head -1 | cut -d'"' -f4); \
+	IFS='.' read -r major minor patch <<< "$$CURRENT"; \
+	NEW_MINOR=$$((minor + 1)); \
+	NEW_VERSION="$$major.$$NEW_MINOR.0"; \
+	$(MAKE) release-branch VERSION=$$NEW_VERSION
+
+# Create major release branch (convenience wrapper)
+release-major-branch:
+	@CURRENT=$$(grep '"version"' projects/vault-v2/package.json | head -1 | cut -d'"' -f4); \
+	IFS='.' read -r major minor patch <<< "$$CURRENT"; \
+	NEW_MAJOR=$$((major + 1)); \
+	NEW_VERSION="$$NEW_MAJOR.0.0"; \
+	$(MAKE) release-branch VERSION=$$NEW_VERSION

README.md

@@ -35,14 +35,89 @@ make vault
 - **Unified UI**: One Vite UI bundle for both web and desktop.
 - **Easy builds**: One command to build everything.
 
+## Release Process
+
+### Creating a Release
+
+The project uses a Makefile-based release workflow for versioning and branch management:
+
+#### Quick Release Commands
+
+```bash
+# Create release branch with specific version
+make release-branch VERSION=2.2.7
+
+# Auto-increment versions and create branch
+make release-patch-branch  # Bumps X.Y.Z -> X.Y.(Z+1)
+make release-minor-branch  # Bumps X.Y.Z -> X.(Y+1).0
+make release-major-branch  # Bumps X.Y.Z -> (X+1).0.0
+```
+
+#### Manual Release Steps
+
+1. **Create release branch and update version:**
+   ```bash
+   make release-branch VERSION=2.2.7
+   ```
+
+2. **Build and test locally with signing:**
+   ```bash
+   cd projects/vault-v2
+   ./build-signed.sh
+   ```
+
+3. **Commit changes:**
+   ```bash
+   git add .
+   git commit -m "chore: release v2.2.7"
+   ```
+
+4. **Push branch:**
+   ```bash
+   git push -u origin release-2.2.7
+   ```
+
+5. **Create Pull Request to master**
+
+6. **After merge, create and push tag:**
+   ```bash
+   git tag -a v2.2.7 -m "Release v2.2.7"
+   git push --tags
+   ```
+
+### CI/CD Signing
+
+The GitHub Actions workflow automatically signs and notarizes macOS builds when the following repository secrets are configured:
+
+- `APPLE_ID` - Apple developer account email
+- `APPLE_ID_PASSWORD` - App-specific password for notarization
+- `APPLE_TEAM_ID` - Apple developer team ID (e.g., DR57X8Z394)
+- `APPLE_CERTIFICATE` - Base64-encoded Developer ID certificate
+- `CERT_PW` - Certificate password
+
+### Local Signing (macOS)
+
+For local signed builds:
+
+```bash
+cd projects/vault-v2
+
+# Build and sign
+./build-signed.sh
+
+# Notarize (requires Apple credentials)
+APPLE_ID="your-email@example.com" \
+APPLE_PASSWORD="app-specific-password" \
+./notarize.sh
+```
+
 ## Contributing
 
 See [docs/contributing.md](docs/contributing.md).
 
 ## Architecture
 
 See [docs/architecture.md](docs/architecture.md).
- Bitcoin Only Stack
 
 
 

RELEASE.md

@@ -0,0 +1,172 @@
+# Release Process
+
+This document describes the release process for KeepKey Bitcoin-Only Vault.
+
+## Quick Start
+
+### Creating a New Release (e.g., 2.2.6)
+
+```bash
+# Method 1: Create release branch and update version in one command
+make release-branch VERSION=2.2.6
+
+# Method 2: Auto-increment version and create branch
+make release-patch-branch  # For patch release (2.2.5 -> 2.2.6)
+make release-minor-branch  # For minor release (2.2.5 -> 2.3.0)
+make release-major-branch  # For major release (2.2.5 -> 3.0.0)
+```
+
+## Release Workflow
+
+### 1. Create Release Branch and Update Version
+
+```bash
+# Create release branch and update all version files
+make release-branch VERSION=2.2.6
+```
+
+This command will:
+- Create a new branch named `release-2.2.6`
+- Update version in all relevant files:
+  - `VERSION`
+  - `projects/vault-v2/package.json`
+  - `projects/vault-v2/src-tauri/tauri.conf.json`
+  - `projects/vault-v2/src-tauri/Cargo.toml`
+  - `projects/keepkey-rust/Cargo.toml`
+  - `projects/vault-v2/VERSION`
+  - `projects/keepkey-rust/VERSION`
+  - Lock files (`package-lock.json`, `Cargo.lock`)
+
+### 2. Review Changes
+
+```bash
+git diff
+```
+
+### 3. Build and Test
+
+```bash
+# Build the application
+make vault-build
+
+# Run tests
+make test-keepkey-rust
+```
+
+### 4. Commit Changes
+
+```bash
+git add .
+git commit -m "chore: release v2.2.6"
+```
+
+### 5. Push Release Branch
+
+```bash
+git push -u origin release-2.2.6
+```
+
+### 6. Create Pull Request
+
+Create a PR from `release-2.2.6` to `master` branch on GitHub.
+
+### 7. After PR Merge
+
+Once the PR is merged to master:
+
+```bash
+# Checkout master and pull latest
+git checkout master
+git pull
+
+# Create and push tag
+git tag -a v2.2.6 -m "Release v2.2.6"
+git push --tags
+```
+
+The tag will trigger the GitHub Actions release workflow to:
+- Build applications for all platforms (Windows, macOS, Linux)
+- Create a GitHub release with artifacts
+- Upload built binaries
+
+## Version Management
+
+### Version Sources
+
+The primary version source is `projects/vault-v2/package.json`. All other version files are synchronized from this source.
+
+### Files Updated During Release
+
+- `VERSION` - Root version file
+- `projects/vault-v2/package.json` - Main application package
+- `projects/vault-v2/src-tauri/tauri.conf.json` - Tauri configuration
+- `projects/vault-v2/src-tauri/Cargo.toml` - Rust backend
+- `projects/keepkey-rust/Cargo.toml` - KeepKey Rust library
+- `projects/vault-v2/VERSION` - Project version file
+- `projects/keepkey-rust/VERSION` - Library version file
+- Lock files (`package-lock.json`, `Cargo.lock`)
+
+### Makefile Targets
+
+#### Release Branch Creation
+- `make release-branch VERSION=x.y.z` - Create branch and set specific version
+- `make release-patch-branch` - Auto-increment patch version and create branch
+- `make release-minor-branch` - Auto-increment minor version and create branch
+- `make release-major-branch` - Auto-increment major version and create branch
+
+#### Version Update Only
+- `make release VERSION=x.y.z` - Update version without creating branch
+- `make release-patch` - Increment patch version (2.2.5 -> 2.2.6)
+- `make release-minor` - Increment minor version (2.2.5 -> 2.3.0)
+- `make release-major` - Increment major version (2.2.5 -> 3.0.0)
+
+## GitHub Actions
+
+The project includes automated workflows:
+
+### Build Workflow (`.github/workflows/build.yml`)
+**Triggered by:**
+- Push to `main`, `master`, or `release-*` branches
+- Pull requests to these branches
+- Manual workflow dispatch
+
+**Purpose:** CI/CD builds and testing for all platforms
+
+### Release Workflow (`.github/workflows/release.yml`)
+**Triggered by:**
+- Tags starting with `v*` (e.g., `v2.2.6`)
+- Manual workflow dispatch
+
+**Purpose:** Creates official GitHub releases with artifacts for:
+- Windows (MSI installer)
+- macOS (DMG installer)
+- Linux (AppImage, DEB packages)
+
+## Best Practices
+
+1. **Always create a release branch** for version updates
+2. **Test thoroughly** before pushing the release branch
+3. **Use semantic versioning**:
+   - Patch (x.y.Z): Bug fixes, minor updates
+   - Minor (x.Y.z): New features, backward compatible
+   - Major (X.y.z): Breaking changes
+4. **Document changes** in commit messages and PR descriptions
+5. **Tag only after** PR is merged to master
+
+## Troubleshooting
+
+### Version Mismatch
+If version files get out of sync:
+```bash
+make release VERSION=<correct-version>
+```
+
+### Failed GitHub Actions
+Check the Actions tab in GitHub for build logs and errors.
+
+### Local Build Issues
+```bash
+# Clean and rebuild
+make clean
+make rebuild
+```

VERSION

@@ -0,0 +1 @@
+2.2.8