From 670fbc887f0d20a3f0df111dbbafe3fba207e778 Mon Sep 17 00:00:00 2001 From: Lifei Zhou Date: Tue, 17 Mar 2026 17:09:40 +1100 Subject: [PATCH] fix: removed double dash in pnpm command (#7951) --- .github/workflows/bundle-desktop-linux.yml | 2 +- .github/workflows/bundle-desktop-manual.yml | 9 +++++++++ .github/workflows/bundle-desktop-windows.yml | 2 +- .github/workflows/canary.yml | 17 +++++++++++++++-- BUILDING_LINUX.md | 6 +++--- ui/desktop/README.md | 6 +++--- ui/desktop/package.json | 2 +- 7 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.github/workflows/bundle-desktop-linux.yml b/.github/workflows/bundle-desktop-linux.yml index 6f6d5004c2..496b613348 100644 --- a/.github/workflows/bundle-desktop-linux.yml +++ b/.github/workflows/bundle-desktop-linux.yml @@ -146,7 +146,7 @@ jobs: echo "Building Linux packages (.deb, .rpm, and .flatpak)..." # Build all configured packages - pnpm run make -- --platform=linux --arch=x64 + pnpm run make --platform=linux --arch=x64 echo "Build completed. Checking output..." ls -la out/ diff --git a/.github/workflows/bundle-desktop-manual.yml b/.github/workflows/bundle-desktop-manual.yml index f2943e8d66..84f6d962ba 100644 --- a/.github/workflows/bundle-desktop-manual.yml +++ b/.github/workflows/bundle-desktop-manual.yml @@ -17,3 +17,12 @@ jobs: with: signing: false ref: ${{ inputs.branch }} + + bundle-desktop-intel-unsigned: + uses: ./.github/workflows/bundle-desktop-intel.yml + permissions: + id-token: write + contents: read + with: + signing: false + ref: ${{ inputs.branch }} diff --git a/.github/workflows/bundle-desktop-windows.yml b/.github/workflows/bundle-desktop-windows.yml index 851d464107..6866f053a4 100644 --- a/.github/workflows/bundle-desktop-windows.yml +++ b/.github/workflows/bundle-desktop-windows.yml @@ -143,7 +143,7 @@ jobs: pnpm install --frozen-lockfile node scripts/build-main.js node scripts/prepare-platform-binaries.js - pnpm run make -- --platform=win32 --arch=x64 + pnpm run make --platform=win32 --arch=x64 - name: Copy exe to final out folder and prepare flat distribution shell: bash diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 02cee8a60d..9445312b2e 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -80,7 +80,20 @@ jobs: signing: false # ------------------------------------------------------------ - # 5) Bundle Desktop App (Linux) - builds goosed and Electron app + # 5) Bundle Desktop App (macOS Intel) - builds goosed and Electron app + # ------------------------------------------------------------ + bundle-desktop-intel: + needs: [prepare-version] + uses: ./.github/workflows/bundle-desktop-intel.yml + permissions: + id-token: write + contents: read + with: + version: ${{ needs.prepare-version.outputs.version }} + signing: false + + # ------------------------------------------------------------ + # 6) Bundle Desktop App (Linux) - builds goosed and Electron app # ------------------------------------------------------------ bundle-desktop-linux: needs: [prepare-version] @@ -104,7 +117,7 @@ jobs: release: name: Release runs-on: ubuntu-latest - needs: [build-cli, install-script, bundle-desktop, bundle-desktop-linux, bundle-desktop-windows] + needs: [build-cli, install-script, bundle-desktop, bundle-desktop-intel, bundle-desktop-linux, bundle-desktop-windows] permissions: contents: write id-token: write # Required for Sigstore OIDC signing diff --git a/BUILDING_LINUX.md b/BUILDING_LINUX.md index de57a84c73..f035ecb6cc 100644 --- a/BUILDING_LINUX.md +++ b/BUILDING_LINUX.md @@ -73,7 +73,7 @@ cp ../../target/release/goosed src/bin/ #### Option A: ZIP Distribution (Recommended) Works on all Linux distributions: ```bash -pnpm run make -- --targets=@electron-forge/maker-zip +pnpm run make --targets=@electron-forge/maker-zip ``` Output: `out/make/zip/linux/x64/goose-linux-x64-{version}.zip` @@ -81,7 +81,7 @@ Output: `out/make/zip/linux/x64/goose-linux-x64-{version}.zip` #### Option B: DEB Package For Debian/Ubuntu systems: ```bash -pnpm run make -- --targets=@electron-forge/maker-deb +pnpm run make --targets=@electron-forge/maker-deb ``` Output: `out/make/deb/x64/goose_{version}_amd64.deb` @@ -148,7 +148,7 @@ sudo apt install flatpak flatpak-builder flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo # Build with Electron Forge -pnpm run make -- --targets=@electron-forge/maker-flatpak +pnpm run make --targets=@electron-forge/maker-flatpak ``` Output: `out/make/flatpak/x86_64/*.flatpak` diff --git a/ui/desktop/README.md b/ui/desktop/README.md index 463da0267d..8f379c6915 100644 --- a/ui/desktop/README.md +++ b/ui/desktop/README.md @@ -71,13 +71,13 @@ cp ../../target/release/goosed src/bin/ 3. Build the application: ```bash # For ZIP distribution (works on all Linux distributions) -pnpm run make -- --targets=@electron-forge/maker-zip +pnpm run make --targets=@electron-forge/maker-zip # For DEB package (Debian/Ubuntu) -pnpm run make -- --targets=@electron-forge/maker-deb +pnpm run make --targets=@electron-forge/maker-deb # For Flatpak (requires flatpak and flatpak-builder) -pnpm run make -- --targets=@electron-forge/maker-flatpak +pnpm run make --targets=@electron-forge/maker-flatpak ``` The built application will be available in: diff --git a/ui/desktop/package.json b/ui/desktop/package.json index df70af1b2c..ce57791c7d 100644 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -19,7 +19,7 @@ "make": "electron-forge make", "bundle:default": "node scripts/prepare-platform-binaries.js && pnpm run make && BUNDLE_NAME=\"${GOOSE_BUNDLE_NAME:-Goose}\" && APP_DIR=\"out/${BUNDLE_NAME}-darwin-arm64\" && APP_BUNDLE=\"${APP_DIR}/${BUNDLE_NAME}.app\" && (cd \"$APP_DIR\" && ditto -c -k --sequesterRsrc --keepParent \"${BUNDLE_NAME}.app\" \"${BUNDLE_NAME}.zip\") || echo \"${APP_BUNDLE} not found; either the binary is not built or you are not on macOS\"", "bundle:alpha": "ALPHA=true node scripts/prepare-platform-binaries.js && ALPHA=true pnpm run make && BUNDLE_NAME=\"${GOOSE_BUNDLE_NAME:-Goose}\" && APP_DIR=\"out/${BUNDLE_NAME}-darwin-arm64\" && APP_BUNDLE=\"${APP_DIR}/${BUNDLE_NAME}.app\" && (cd \"$APP_DIR\" && ditto -c -k --sequesterRsrc --keepParent \"${BUNDLE_NAME}.app\" \"${BUNDLE_NAME}_alpha.zip\") || echo \"${APP_BUNDLE} not found; either the binary is not built or you are not on macOS\"", - "bundle:intel": "node scripts/prepare-platform-binaries.js && pnpm run make -- --arch=x64 && BUNDLE_NAME=\"${GOOSE_BUNDLE_NAME:-Goose}\" && APP_DIR=\"out/${BUNDLE_NAME}-darwin-x64\" && APP_BUNDLE=\"${APP_DIR}/${BUNDLE_NAME}.app\" && (cd \"$APP_DIR\" && ditto -c -k --sequesterRsrc --keepParent \"${BUNDLE_NAME}.app\" \"${BUNDLE_NAME}_intel_mac.zip\")", + "bundle:intel": "node scripts/prepare-platform-binaries.js && pnpm run make --arch=x64 && BUNDLE_NAME=\"${GOOSE_BUNDLE_NAME:-Goose}\" && APP_DIR=\"out/${BUNDLE_NAME}-darwin-x64\" && APP_BUNDLE=\"${APP_DIR}/${BUNDLE_NAME}.app\" && (cd \"$APP_DIR\" && ditto -c -k --sequesterRsrc --keepParent \"${BUNDLE_NAME}.app\" \"${BUNDLE_NAME}_intel_mac.zip\")", "debug": "echo 'run --remote-debugging-port=8315' && BUNDLE_NAME=\"${GOOSE_BUNDLE_NAME:-Goose}\" && lldb \"out/${BUNDLE_NAME}-darwin-arm64/${BUNDLE_NAME}.app\"", "test-e2e": "pnpm run generate-api && playwright test", "test-e2e:dev": "pnpm run generate-api && playwright test --reporter=list --retries=0 --max-failures=1",