Skip to content

Commit b846652

Browse files
vincentkocvincentkoc
committed
fix(ci): regenerate Swift protocol model
1 parent 6441e56 commit b846652

3 files changed

Lines changed: 71 additions & 35 deletions

File tree

‎apps/shared/OpenClawKit/Sources/OpenClawProtocol/GatewayModels.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6592,6 +6592,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
65926592
public let turnsourceto: AnyCodable?
65936593
public let turnsourceaccountid: AnyCodable?
65946594
public let turnsourcethreadid: AnyCodable?
6595+
public let approvalreviewerdeviceids: [String]?
65956596
public let requiredeliveryroute: Bool?
65966597
public let suppressdelivery: Bool?
65976598
public let timeoutms: Int?
@@ -6618,6 +6619,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
66186619
turnsourceto: AnyCodable?,
66196620
turnsourceaccountid: AnyCodable?,
66206621
turnsourcethreadid: AnyCodable?,
6622+
approvalreviewerdeviceids: [String]?,
66216623
requiredeliveryroute: Bool? = nil,
66226624
suppressdelivery: Bool? = nil,
66236625
timeoutms: Int?,
@@ -6643,6 +6645,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
66436645
self.turnsourceto = turnsourceto
66446646
self.turnsourceaccountid = turnsourceaccountid
66456647
self.turnsourcethreadid = turnsourcethreadid
6648+
self.approvalreviewerdeviceids = approvalreviewerdeviceids
66466649
self.requiredeliveryroute = requiredeliveryroute
66476650
self.suppressdelivery = suppressdelivery
66486651
self.timeoutms = timeoutms
@@ -6670,6 +6673,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
66706673
case turnsourceto = "turnSourceTo"
66716674
case turnsourceaccountid = "turnSourceAccountId"
66726675
case turnsourcethreadid = "turnSourceThreadId"
6676+
case approvalreviewerdeviceids = "approvalReviewerDeviceIds"
66736677
case requiredeliveryroute = "requireDeliveryRoute"
66746678
case suppressdelivery = "suppressDelivery"
66756679
case timeoutms = "timeoutMs"

‎scripts/check-changed.mjs‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -290,21 +290,26 @@ export function createChangedCheckPlan(result, options = {}) {
290290
add("prompt snapshot drift", ["prompt:snapshots:check"]);
291291
}
292292
if (shouldRunPromptSnapshotOwnerTest(result.paths)) {
293-
add("prompt snapshot owner test", ["test:serial", "test/scripts/prompt-snapshots.test.ts"]);
293+
add(
294+
"prompt snapshot owner test",
295+
["test:serial", "test/scripts/prompt-snapshots.test.ts"],
296+
baseEnv,
297+
);
294298
}
295299
if (shouldRunRuntimeSidecarBaselineCheck(result.paths)) {
296300
add("runtime sidecar baseline", ["runtime-sidecars:check"]);
297-
add("runtime sidecar owner test", [
298-
"test:serial",
299-
"src/plugins/bundled-plugin-metadata.test.ts",
300-
]);
301+
add(
302+
"runtime sidecar owner test",
303+
["test:serial", "src/plugins/bundled-plugin-metadata.test.ts"],
304+
baseEnv,
305+
);
301306
}
302307
if (shouldRunAppcastOwnerTest(result.paths)) {
303-
add("appcast owner tests", [
304-
"test:serial",
305-
"test/appcast.test.ts",
306-
"test/scripts/make-appcast.test.ts",
307-
]);
308+
add(
309+
"appcast owner tests",
310+
["test:serial", "test/appcast.test.ts", "test/scripts/make-appcast.test.ts"],
311+
baseEnv,
312+
);
308313
}
309314
add("package patch guard", ["deps:patches:check"]);
310315

@@ -410,7 +415,7 @@ export function createChangedCheckPlan(result, options = {}) {
410415
addLint("lint apps", ["lint:apps"]);
411416
}
412417
if (lanes.apps && hasMacosAppCiPath(result.paths)) {
413-
add("macOS app CI tests", ["test:macos:ci"]);
418+
add("macOS app CI tests", ["test:macos:ci"], baseEnv);
414419
}
415420

416421
if (lanes.core || lanes.extensions) {

‎test/scripts/changed-lanes.test.ts‎

Lines changed: 51 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,21 @@ describe("scripts/changed-lanes", () => {
807807
});
808808
});
809809

810+
it("runs changed-check app tests under the parent heavy-check lock", () => {
811+
const result = detectChangedLanes([
812+
"apps/shared/OpenClawKit/Sources/OpenClawProtocol/GatewayModels.swift",
813+
]);
814+
const plan = createChangedCheckPlan(result, { env: { PATH: "/usr/bin" } });
815+
const testCommand = plan.commands.find((command) => command.args[0] === "test:macos:ci");
816+
817+
expect(testCommand?.env).toEqual({
818+
OPENCLAW_OXLINT_SKIP_LOCK: "1",
819+
OPENCLAW_TEST_HEAVY_CHECK_LOCK_HELD: "1",
820+
OPENCLAW_TSGO_HEAVY_CHECK_LOCK_HELD: "1",
821+
PATH: "/usr/bin",
822+
});
823+
});
824+
810825
it("routes core test-only changes to core test lanes only", () => {
811826
const result = detectChangedLanes([
812827
"packages/normalization-core/src/string-normalization.test.ts",
@@ -1315,10 +1330,12 @@ describe("scripts/changed-lanes", () => {
13151330
name: "prompt snapshot drift",
13161331
args: ["prompt:snapshots:check"],
13171332
});
1318-
expect(plan.commands).toContainEqual({
1319-
name: "prompt snapshot owner test",
1320-
args: ["test:serial", "test/scripts/prompt-snapshots.test.ts"],
1321-
});
1333+
expect(plan.commands).toContainEqual(
1334+
expect.objectContaining({
1335+
name: "prompt snapshot owner test",
1336+
args: ["test:serial", "test/scripts/prompt-snapshots.test.ts"],
1337+
}),
1338+
);
13221339
});
13231340

13241341
it("runs the prompt snapshot owner test for model fixture generator surfaces", () => {
@@ -1332,10 +1349,12 @@ describe("scripts/changed-lanes", () => {
13321349
const result = detectChangedLanes(["scripts/sync-codex-model-prompt-fixture.ts"]);
13331350
const plan = createChangedCheckPlan(result);
13341351

1335-
expect(plan.commands).toContainEqual({
1336-
name: "prompt snapshot owner test",
1337-
args: ["test:serial", "test/scripts/prompt-snapshots.test.ts"],
1338-
});
1352+
expect(plan.commands).toContainEqual(
1353+
expect.objectContaining({
1354+
name: "prompt snapshot owner test",
1355+
args: ["test:serial", "test/scripts/prompt-snapshots.test.ts"],
1356+
}),
1357+
);
13391358
});
13401359

13411360
it("runs runtime sidecar baseline checks for baseline owner surfaces", () => {
@@ -1355,10 +1374,12 @@ describe("scripts/changed-lanes", () => {
13551374
name: "runtime sidecar baseline",
13561375
args: ["runtime-sidecars:check"],
13571376
});
1358-
expect(plan.commands).toContainEqual({
1359-
name: "runtime sidecar owner test",
1360-
args: ["test:serial", "src/plugins/bundled-plugin-metadata.test.ts"],
1361-
});
1377+
expect(plan.commands).toContainEqual(
1378+
expect.objectContaining({
1379+
name: "runtime sidecar owner test",
1380+
args: ["test:serial", "src/plugins/bundled-plugin-metadata.test.ts"],
1381+
}),
1382+
);
13621383
});
13631384

13641385
it("guards release metadata package changes to the top-level version field", () => {
@@ -1472,10 +1493,12 @@ describe("scripts/changed-lanes", () => {
14721493
bin: "node",
14731494
}),
14741495
);
1475-
expect(plan.commands).toContainEqual({
1476-
name: "macOS app CI tests",
1477-
args: ["test:macos:ci"],
1478-
});
1496+
expect(plan.commands).toContainEqual(
1497+
expect.objectContaining({
1498+
name: "macOS app CI tests",
1499+
args: ["test:macos:ci"],
1500+
}),
1501+
);
14791502
}
14801503
});
14811504

@@ -1484,10 +1507,12 @@ describe("scripts/changed-lanes", () => {
14841507
const plan = createChangedCheckPlan(result);
14851508

14861509
expect(shouldRunAppcastOwnerTest(result.paths)).toBe(true);
1487-
expect(plan.commands).toContainEqual({
1488-
name: "appcast owner tests",
1489-
args: ["test:serial", "test/appcast.test.ts", "test/scripts/make-appcast.test.ts"],
1490-
});
1510+
expect(plan.commands).toContainEqual(
1511+
expect.objectContaining({
1512+
name: "appcast owner tests",
1513+
args: ["test:serial", "test/appcast.test.ts", "test/scripts/make-appcast.test.ts"],
1514+
}),
1515+
);
14911516
expect(plan.commands.map((command) => command.name)).not.toContain("macOS app CI tests");
14921517
});
14931518

@@ -1502,10 +1527,12 @@ describe("scripts/changed-lanes", () => {
15021527
});
15031528

15041529
expect(plan.commands.map((command) => command.args[0])).toContain("lint:apps");
1505-
expect(plan.commands).toContainEqual({
1506-
name: "macOS app CI tests",
1507-
args: ["test:macos:ci"],
1508-
});
1530+
expect(plan.commands).toContainEqual(
1531+
expect.objectContaining({
1532+
name: "macOS app CI tests",
1533+
args: ["test:macos:ci"],
1534+
}),
1535+
);
15091536
});
15101537

15111538
it("keeps macOS app CI tests out of Android-only app changes", () => {

0 commit comments

Comments
 (0)