From 3b54c44609c8ec73e351cea62748b65fb6041dbd Mon Sep 17 00:00:00 2001 From: Alexander Mills Date: Tue, 15 Sep 2026 23:59:09 -0500 Subject: [PATCH 1/2] fix(zpkg): validate published manifest without absent lock --- .zpkg.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zpkg.toml b/.zpkg.toml index 72a45115..3e66b3f4 100644 --- a/.zpkg.toml +++ b/.zpkg.toml @@ -37,7 +37,7 @@ dir = ".vendor/.zed" [publish] include_readme = true tag_format = "v{version}" -smoke_test = "test -f \"$ZED_PKG_TEST_TARGET/.auth-shared.toml\" && test ! -e \"$ZED_PKG_TEST_TARGET/.shared-auth.toml\" && test -x \"$ZED_PKG_TEST_TARGET/target/release/zed\" && test -x \"$ZED_PKG_TEST_TARGET/target/release/zed-gitops\" && test -x \"$ZED_PKG_TEST_TARGET/target/release/zed-git-install\" && \"$ZED_PKG_TEST_TARGET/target/release/zed\" --version && \"$ZED_PKG_TEST_TARGET/target/release/zed\" validate --manifest \"$ZED_PKG_TEST_TARGET/.zpkg.toml\" --lock \"$ZED_PKG_TEST_TARGET/.zpkg.lock\" --json >/dev/null && \"$ZED_PKG_TEST_TARGET/target/release/zed\" gitops validate --help && \"$ZED_PKG_TEST_TARGET/target/release/zed-git-install\" --help >/dev/null" +smoke_test = "test -f \"$ZED_PKG_TEST_TARGET/.auth-shared.toml\" && test ! -e \"$ZED_PKG_TEST_TARGET/.shared-auth.toml\" && test -x \"$ZED_PKG_TEST_TARGET/target/release/zed\" && test -x \"$ZED_PKG_TEST_TARGET/target/release/zed-gitops\" && test -x \"$ZED_PKG_TEST_TARGET/target/release/zed-git-install\" && \"$ZED_PKG_TEST_TARGET/target/release/zed\" --version && \"$ZED_PKG_TEST_TARGET/target/release/zed\" validate --manifest \"$ZED_PKG_TEST_TARGET/.zpkg.toml\" --json >/dev/null && \"$ZED_PKG_TEST_TARGET/target/release/zed\" gitops validate --help && \"$ZED_PKG_TEST_TARGET/target/release/zed-git-install\" --help >/dev/null" exclude = [ ".env", ".env.*", From 370d6dc14a073afa4d9a7bd0c837d38139c571cc Mon Sep 17 00:00:00 2001 From: Alexander Mills Date: Tue, 15 Sep 2026 23:59:34 -0500 Subject: [PATCH 2/2] test(zpkg): keep CLI flags outside manifest authority --- tests/toml_contract.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/toml_contract.rs b/tests/toml_contract.rs index 1a4ec8bb..d1f34cc2 100644 --- a/tests/toml_contract.rs +++ b/tests/toml_contract.rs @@ -57,18 +57,16 @@ fn zed_package_version_matches_the_native_release_version() { } #[test] -fn zed_package_declares_the_canonical_flags_runtime_and_contract() { +fn zed_cli_flags_remain_a_separate_canonical_contract() { let root = root(); let zpkg = parse_toml(&root.join(".zpkg.toml")); let cargo = parse_toml(&root.join("Cargo.toml")); let flags = parse_toml(&root.join(".cli-flags.toml")); - assert_eq!( - string_at(&zpkg, &["cli", "flags_contract"]), - ".cli-flags.toml" + assert!( + zpkg.get("cli").is_none(), + ".zpkg.toml must stay within the zed-interfaces Manifest authority; CLI flags belong in .cli-flags.toml" ); - assert_eq!(string_at(&zpkg, &["cli", "flags_runtime"]), "flags-2-env"); - assert_eq!(string_at(&zpkg, &["cli", "primary_bin"]), "zed"); let flags2env = cargo .get("dependencies")