Skip to content

Commit b1cc60b

Browse files
authored
Merge branch 'main' into pr/fix-enabled-server-disconnected-status
2 parents 7327003 + 71f18ca commit b1cc60b

3 files changed

Lines changed: 21 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,13 @@ jobs:
239239
tauri-cli-${{ runner.os }}-
240240
241241
- run: pnpm install --frozen-lockfile
242-
- run: pnpm build
242+
# PR build verification only: disable updater-artifact signing so the build
243+
# needs no secrets. Fork PRs don't receive repository secrets, so requiring
244+
# TAURI_SIGNING_PRIVATE_KEY here makes every fork PR fail. Real signed
245+
# updater artifacts are produced by the release flow (build-tauri.yml /
246+
# nightly.yml) on trusted refs, which is the only place the key belongs.
247+
- run: pnpm --filter @mcpmux/desktop exec tauri build --config '{"bundle":{"createUpdaterArtifacts":false}}'
243248
env:
244-
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
245-
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
246249
# Ad-hoc signing (no Apple Developer ID)
247250
APPLE_SIGNING_IDENTITY: '-'
248251

.github/workflows/e2e-desktop.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,23 @@ jobs:
9797
9898
- run: pnpm install --frozen-lockfile
9999

100+
# E2E only needs a runnable app binary, not signed updater artifacts.
101+
# Drop the `updater` bundle and disable updater-artifact creation so the
102+
# build requires no signing key — fork PRs don't receive repository
103+
# secrets, so requiring the key here makes every fork PR fail. Signed
104+
# updater artifacts are produced by the release flow on trusted refs.
100105
- name: Build app (Linux)
101106
if: matrix.os == 'ubuntu-latest'
102-
run: pnpm --filter @mcpmux/desktop exec tauri build --bundles deb,rpm,updater
107+
run: pnpm --filter @mcpmux/desktop exec tauri build --bundles deb,rpm --config '{"bundle":{"createUpdaterArtifacts":false}}'
103108
env:
104109
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
105-
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
106-
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
107110

108111
- name: Build app (Windows)
109112
if: matrix.os == 'windows-latest'
110-
run: pnpm build
111-
env:
112-
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
113-
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
113+
# shell: bash so the inline --config JSON is passed verbatim; PowerShell's
114+
# native-argument handling would mangle the embedded double quotes.
115+
shell: bash
116+
run: pnpm --filter @mcpmux/desktop exec tauri build --config '{"bundle":{"createUpdaterArtifacts":false}}'
114117

115118
# TODO(playwright-migration): desktop E2E has stale assertions from the IA
116119
# redesign and is being replaced (tauri-playwright spike). Non-blocking

Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)