Skip to content

Commit ec0f34f

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/extension-setup-wizard-web-peer
2 parents ce57a84 + 3e3e0e4 commit ec0f34f

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

‎.github/workflows/pages-preview.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ jobs:
121121
--public-origin "$PREVIEW_ORIGIN" \
122122
--output .preview-registry
123123
cp -R .preview-registry/. apps/client-web/dist/
124+
cp -R apps/client-web/dist "$GITHUB_WORKSPACE/.pages-preview"
124125
125126
- name: Reverify pull-request identity before delivery
126127
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -185,7 +186,7 @@ jobs:
185186
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
186187
packageManager: npm
187188
wranglerVersion: 4.114.0
188-
workingDirectory: candidate/apps/client-web/dist
189+
workingDirectory: .pages-preview
189190
command: >-
190191
pages deploy .
191192
--project-name=${{ vars.CLOUDFLARE_PAGES_PROJECT }}

‎scripts/native-extension-distribution.test.mjs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@ test('separates exact-main app delivery from the Changesets Extension release li
306306
assert.match(preview, /pnpm build/)
307307
assert.match(preview, /pdm run inkcre-ext preview build/)
308308
assert.match(preview, /--public-origin "\$PREVIEW_ORIGIN"/)
309-
assert.match(preview, /workingDirectory: candidate\/apps\/client-web\/dist/)
309+
assert.match(preview, /cp -R apps\/client-web\/dist "\$GITHUB_WORKSPACE\/\.pages-preview"/)
310+
assert.match(preview, /workingDirectory: \.pages-preview/)
310311
assert.match(preview, /pages deploy \./)
311312
assert.doesNotMatch(preview, /INKCRE_EXTENSION_REGISTRY_TOKEN/)
312313

0 commit comments

Comments
 (0)