From d045c9900feaaf995dece826ca5b9b2bf7884f19 Mon Sep 17 00:00:00 2001 From: Kalvin C Date: Mon, 3 Mar 2025 17:38:42 -0800 Subject: [PATCH] ci: use npm run bundle:intel in intel workflow (#1488) --- .github/workflows/bundle-desktop-intel.yml | 8 ++++---- ui/desktop/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bundle-desktop-intel.yml b/.github/workflows/bundle-desktop-intel.yml index 11894814..e1dee6c8 100644 --- a/.github/workflows/bundle-desktop-intel.yml +++ b/.github/workflows/bundle-desktop-intel.yml @@ -190,7 +190,7 @@ jobs: attempt=0 max_attempts=2 until [ $attempt -ge $max_attempts ]; do - npm run bundle:default && break + npm run bundle:intel && break attempt=$((attempt + 1)) echo "Attempt $attempt failed. Retrying..." sleep 5 @@ -207,7 +207,7 @@ jobs: attempt=0 max_attempts=2 until [ $attempt -ge $max_attempts ]; do - npm run bundle:default && break + npm run bundle:intel && break attempt=$((attempt + 1)) echo "Attempt $attempt failed. Retrying..." sleep 5 @@ -234,7 +234,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: Goose-darwin-x64 - path: ui/desktop/out/Goose-darwin-x64/Goose.zip + path: ui/desktop/out/Goose-darwin-x64/Goose_intel_mac.zip - name: Quick launch test (macOS) if: ${{ inputs.quick_test }} @@ -255,4 +255,4 @@ jobs: exit 1 fi # Kill the app to clean up - pkill -f "Goose.app/Contents/MacOS/Goose" \ No newline at end of file + pkill -f "Goose.app/Contents/MacOS/Goose" diff --git a/ui/desktop/package.json b/ui/desktop/package.json index cc1ae576..5ddf539c 100644 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -13,7 +13,7 @@ "make": "electron-forge make", "bundle:default": "npm run make && cd out/Goose-darwin-arm64 && ditto -c -k --sequesterRsrc --keepParent Goose.app Goose.zip", "bundle:windows": "npm run make -- --platform=win32 --arch=x64 && node scripts/copy-windows-dlls.js", - "bundle:intel": " npm run make -- --arch=x64 && cd out/Goose-darwin-x64 && ditto -c -k --sequesterRsrc --keepParent Goose.app Goose_intel_mac.zip", + "bundle:intel": "npm run make -- --arch=x64 && cd out/Goose-darwin-x64 && ditto -c -k --sequesterRsrc --keepParent Goose.app Goose_intel_mac.zip", "debug": "echo 'run --remote-debugging-port=8315' && lldb out/Goose-darwin-arm64/Goose.app", "test-e2e": "electron-forge start > /tmp/out.txt & ELECTRON_PID=$! && sleep 12 && if grep -q 'renderer: ChatWindow loaded' /tmp/out.txt; then echo 'process is running'; pkill -f electron; else echo 'not starting correctly'; cat /tmp/out.txt; pkill -f electron; exit 1; fi", "lint": "eslint \"src/**/*.{ts,tsx}\" --fix",