Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/plugins/nexus-service/convax-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"id": "nexus-service",
"name": "Nexus · OpenRouter",
"description": "Connects Convax to the Convax Workspace in Nexus for OpenRouter chat and live image-model generation through short-lived Data Tokens.",
"version": "0.3.9",
"version": "0.3.10",
"license": "MIT",
"compatibility": {
"pluginSchema": "convax.plugin/7",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/nexus-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microvoid/convax-plugin-nexus-service",
"version": "0.3.9",
"version": "0.3.10",
"private": true,
"type": "module",
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/nexus-service/package/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "nexus-service",
"name": "Nexus · OpenRouter",
"description": "Connects Convax to the Convax Workspace in Nexus for OpenRouter chat and live image-model generation through short-lived Data Tokens.",
"version": "0.3.9",
"version": "0.3.10",
"contributes": {
"generation": {
"models": [
Expand Down
10 changes: 9 additions & 1 deletion tooling/official-marketplace-build.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ export function officialBuildArgs({ bootstrapPreviousV1, changed, previous, v1Re
return [...args, "--initial", "--v1-revision", v1Revision]
}

export function officialBuildInvocation(args) {
return {
args: [fileURLToPath(import.meta.resolve("@convax/marketplace-kit/cli")), ...args],
command: process.execPath,
}
}

function main() {
const root = path.resolve(fileURLToPath(new URL("..", import.meta.url)))
const v1Revision = process.env.GITHUB_SHA ?? spawnSync(
Expand All @@ -43,7 +50,8 @@ function main() {
previous: process.env.CONVAX_MARKETPLACE_PREVIOUS,
v1Revision,
})
const result = spawnSync("convax-marketplace", args, {
const invocation = officialBuildInvocation(args)
const result = spawnSync(invocation.command, invocation.args, {
cwd: root,
encoding: "utf8",
env: process.env,
Expand Down
24 changes: 23 additions & 1 deletion tooling/official-marketplace.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ import { describe, expect, test } from "bun:test"
import { promises as fs } from "node:fs"
import os from "node:os"
import path from "node:path"
import { fileURLToPath } from "node:url"
import {
assertOfficialMarketplaceSource,
loadOfficialMarketplaceSource,
} from "./official-marketplace.mjs"
import { officialBuildArgs } from "./official-marketplace-build.mjs"
import {
officialBuildArgs,
officialBuildInvocation,
} from "./official-marketplace-build.mjs"
import { fetchPreviousRegistry } from "./fetch-marketplace-previous.mjs"
import { root, sha256 } from "./lib.mjs"

Expand Down Expand Up @@ -151,6 +155,24 @@ describe("Official and Builtin marketplace source", () => {
.toThrow("v1 revision must be an exact Git SHA")
})

test("runs the locked Marketplace CLI with the current Bun runtime", () => {
expect(officialBuildInvocation([
"build-index",
".",
"--changed",
"dist/release-plan.json",
])).toEqual({
args: [
fileURLToPath(import.meta.resolve("@convax/marketplace-kit/cli")),
"build-index",
".",
"--changed",
"dist/release-plan.json",
],
command: process.execPath,
})
})

test("prefers production v2 and bootstraps from strict v1 only after an exact v2 404", async () => {
const output = await fs.mkdtemp(path.join(os.tmpdir(), "convax-marketplace-previous-"))
try {
Expand Down