diff --git a/.github/workflows/cookiemonster-windows.yml b/.github/workflows/cookiemonster-windows.yml index 98d57e3907..58aa8f4893 100644 --- a/.github/workflows/cookiemonster-windows.yml +++ b/.github/workflows/cookiemonster-windows.yml @@ -58,7 +58,11 @@ jobs: CM_BRAND: "0" CM_UNSIGNED: "0" OPENCODE_CHANNEL: dev - run: bun test --timeout 20000 electron-builder.config.test.ts src/main/system-cli.test.ts + # The packaging config stages the AE adapter built by cm-v2. + run: | + bun run --cwd ../cm-v2 build + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + bun test --timeout 20000 electron-builder.config.test.ts src/main/system-cli.test.ts - name: Build CookieMonster working-directory: packages/desktop @@ -84,7 +88,7 @@ jobs: const resources = 'dist/win-unpacked/resources' assert.equal(JSON.parse(asar.extractFile(resources+'/app.asar', 'package.json')).version, process.env.CM_VERSION) assert(asar.extractFile(resources+'/app.asar', path.join('out', 'main', 'index.js')).toString().includes('protocol === "blob:"')) - for (const file of ['opencode-cli.exe', 'cli/opencode.exe', 'cm-browser/plugin.mjs', 'vault-auth/windows-x64.exe', 'vault-auth/windows-entry-x64.exe']) assert(fs.existsSync(resources+'/'+file), file) + for (const file of ['opencode-cli.exe', 'cli/opencode.exe', 'cm-browser/dist/plugin-v2.mjs', 'vault-auth/windows-x64.exe', 'vault-auth/windows-entry-x64.exe']) assert(fs.existsSync(resources+'/'+file), file) '@ | node if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } & ./dist/win-unpacked/resources/opencode-cli.exe --version diff --git a/packages/desktop/electron-builder.config.test.ts b/packages/desktop/electron-builder.config.test.ts index 6668654e9a..6e31d51221 100644 --- a/packages/desktop/electron-builder.config.test.ts +++ b/packages/desktop/electron-builder.config.test.ts @@ -12,7 +12,15 @@ test("default packaging includes AE outside asar without an environment override expect(config.extraResources).toContainEqual({ from: "resources/cm-ae", to: "cm-ae", - filter: ["plugin.mjs", "render-worker.mjs", "permissions.json", "ZOD-LICENSE.txt", "MARKED-LICENSE.txt"], + filter: [ + "plugin.mjs", + "render-worker.mjs", + "permissions.json", + "ZOD-LICENSE.txt", + "MARKED-LICENSE.txt", + "server.js", + "package.json", + ], }) for (const name of [ "plugin.mjs", @@ -26,8 +34,9 @@ test("default packaging includes AE outside asar without an environment override ) } expect(config.extraResources).toContainEqual({ - from: "../cm-browser/dist/plugin.mjs", - to: "cm-browser/plugin.mjs", + from: "../cm-browser", + to: "cm-browser", + filter: ["package.json", "dist/plugin-v2.mjs"], }) } finally { if (previous !== undefined) process.env.CM_AE_ARTIFACT_DIR = previous