Skip to content

fix(zpkg): repair published smoke and CLI contract boundary #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
the1mills merged 2 commits into from
Sep 30, 2026
Merged

fix(zpkg): repair published smoke and CLI contract boundary #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b54c44
fix(zpkg): validate published manifest without absent lock
ORESoftware Sep 16, 2026
370d6dc
test(zpkg): keep CLI flags outside manifest authority
ORESoftware Sep 16, 2026
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 .zpkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*",
Expand Down
10 changes: 4 additions & 6 deletions tests/toml_contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading