Release optimization (#21)

* Implement --clean option in build.sh

Add clean build option to build script

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Update APP_PATH to use a specific build directory

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Fix missing xcodebuild parallelization flag

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Set architecture flags based on configuration

Added architecture flags configuration for build process.

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Implement caching for Xcode DerivedData

Add caching for Xcode DerivedData to improve build times.

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Add Sentry CLI caching in release workflow

Add caching for Sentry CLI to optimize installation.

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Merge app zip creation with dSYM upload step

Consolidate app zip creation and dSYM upload into a single step.

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Fix typos in release workflow script

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Optimize git clone for homebrew tap repository

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Add warning before amending last commit

Added warning and confirmation prompt before amending the last commit.

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Fix typo in release workflow step name

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Fix condition check and update architecture flags

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Fix syntax for parallel command execution in release.yml

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Add confirmation before amending last commit

Added confirmation prompt before amending last commit.

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Improve parallel execution handling in release workflow

* Update .github/workflows/release.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Update .github/workflows/release.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Change ARCH_FLAGS to use array syntax

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

* Replace Sentry CLI caching with setup action

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>

---------

Signed-off-by: Karan Mohindroo <96403086+NullPointerDepressiveDisorder@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: NullPointerDepressiveDisorder

.github/workflows/release.yml

@@ -110,6 +110,16 @@ jobs:
 
           echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
           echo "Using version: ${VERSION}"
+
+      - name: Cache Swift Package Manager dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            build/SourcePackages
+            build/.build
+          key: spm-${{ runner.os }}-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            spm-${{ runner.os }}-
       
       - name: Build Release
         run: |
@@ -123,26 +133,35 @@ jobs:
             OTHER_LDFLAGS="-F/System/Library/PrivateFrameworks -framework MultitouchSupport -framework CoreFoundation -framework CoreGraphics" \
             FRAMEWORK_SEARCH_PATHS="/System/Library/PrivateFrameworks" \
             build
-      
-      - name: Create App Zip
-        run: |
-          cd build/Build/Products/Release
-          zip -r MiddleDrag-${{ steps.version.outputs.VERSION }}.zip MiddleDrag.app
-          mv MiddleDrag-${{ steps.version.outputs.VERSION }}.zip $GITHUB_WORKSPACE/
 
-      - name: Install Sentry CLI
-        run: |
-          curl -sL https://sentry.io/get-cli/ | bash
+      - name: Setup Sentry CLI
+        uses: mathieu-bour/setup-sentry-cli@v2
+        with:
+          version: latest
 
-      - name: Upload dSYM to Sentry
+      - name: Create App Zip & Upload dSYM to Sentry
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         run: |
-          sentry-cli debug-files upload \
-            --include-sources \
-            build/Build/Products/Release/
+          # Run in parallel
+          wait_all() {
+            local failed=0
+            for pid in "$@"; do
+              wait "$pid" || failed=1
+            done
+            return $failed
+          }
+          
+          VERSION="${{ steps.version.outputs.VERSION }}"
+          
+          (cd build/Build/Products/Release && zip -r "$GITHUB_WORKSPACE/MiddleDrag-${VERSION}.zip" MiddleDrag.app) &
+          ZIP_PID=$!
+          sentry-cli debug-files upload --include-sources build/Build/Products/Release/ &
+          SENTRY_PID=$!
+          
+          wait_all "$ZIP_PID" "$SENTRY_PID" || { echo "❌ A background job failed"; exit 1; }
 
       - name: Create Sentry release
         env:

.github/workflows/update-homebrew.yml

@@ -51,8 +51,10 @@ jobs:
           SHA=$(shasum -a 256 MiddleDrag.zip | awk '{print $1}')
           
           # Clone tap repo and update
-          git clone https://x-access-token:${HOMEBREW_TAP_TOKEN}@github.com/nullpointerdepressivedisorder/homebrew-tap.git
+          git clone --depth 1 --filter=blob:none --sparse \
+            https://x-access-token:${HOMEBREW_TAP_TOKEN}@github.com/nullpointerdepressivedisorder/homebrew-tap.git
           cd homebrew-tap
+          git sparse-checkout set Casks
           
           sed -i '' "s/version \".*\"/version \"${VERSION}\"/" Casks/middledrag.rb
           sed -i '' "s/sha256 \".*\"/sha256 \"${SHA}\"/" Casks/middledrag.rb

build.sh

@@ -13,9 +13,14 @@ BUNDLE_ID="com.middledrag.MiddleDrag"
 # Parse arguments
 CONFIGURATION="Release"
 RUN_AFTER=false
+CLEAN_BUILD=false
 
 while [[ $# -gt 0 ]]; do
     case $1 in
+        --clean|-c)
+            CLEAN_BUILD=true
+            shift
+            ;;
         --debug|-d)
             CONFIGURATION="Debug"
             shift
@@ -28,6 +33,7 @@ while [[ $# -gt 0 ]]; do
             echo "Usage: ./build.sh [options]"
             echo ""
             echo "Options:"
+            echo "  --clean, -c    Clean previous build"
             echo "  --debug, -d    Build debug configuration"
             echo "  --run, -r      Run after building"
             echo "  --help, -h     Show this help"
@@ -43,15 +49,25 @@ done
 echo "🔨 Building MiddleDrag ($CONFIGURATION)..."
 
 # Clean previous build
-echo "Cleaning previous build..."
-rm -rf "$BUILD_DIR"
+if [ "$CLEAN_BUILD" = true ]; then
+    echo "Cleaning previous build..."
+    rm -rf "$BUILD_DIR"
+fi
+
+# Set architecture flags based on configuration
+if [ "$CONFIGURATION" = "Release" ]; then
+    ARCH_FLAGS=(ARCHS="arm64 x86_64" ONLY_ACTIVE_ARCH=NO)
+else
+    ARCH_FLAGS=(ONLY_ACTIVE_ARCH=YES)
+fi
 
 # Create build directory
 mkdir -p "$BUILD_DIR"
 
 # Build with xcodebuild
 echo "Building with Xcode..."
 xcodebuild \
+    -jobs $(sysctl -n hw.ncpu) \
     -project "$APP_NAME.xcodeproj" \
     -scheme "$APP_NAME" \
     -configuration "$CONFIGURATION" \
@@ -61,11 +77,10 @@ xcodebuild \
     FRAMEWORK_SEARCH_PATHS="/System/Library/PrivateFrameworks" \
     CODE_SIGN_IDENTITY="-" \
     CODE_SIGNING_REQUIRED=NO \
-    ARCHS="$(uname -m)" \
-    ONLY_ACTIVE_ARCH=NO
+    "${ARCH_FLAGS[@]}"
 
 # Find the built app
-APP_PATH=$(find "$BUILD_DIR" -name "$APP_NAME.app" -type d | head -n 1)
+APP_PATH="$BUILD_DIR/Build/Products/$CONFIGURATION/$APP_NAME.app"
 
 if [ -z "$APP_PATH" ]; then
     echo "❌ Build failed: Could not find $APP_NAME.app"

bump-version.sh

@@ -55,6 +55,13 @@ if git ls-remote --tags origin | grep -q "refs/tags/v$VERSION$"; then
 fi
 
 # Stage and amend previous commit
+echo "⚠️  Warning: This will amend the last commit. Make sure it hasn't been pushed yet."
+read -p "Continue (y/n) " -n 1 -r 
+echo
+if [[ ! "$REPLY" =~ ^[Yy]$ ]]; then
+    echo "Aborted."
+    exit 1
+fi
 git add MiddleDrag.xcodeproj/project.pbxproj
 git commit --amend --no-edit
 echo "✓ Amended previous commit with version change"