Skip to content

build: repair locked zed-cli build #384

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

Closed
ORESoftware wants to merge 10 commits into from
Closed

build: repair locked zed-cli build #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ef9648
ci: refresh stale zed-lock pin reproducibly
ORESoftware Sep 13, 2026
5d8cf9d
ci: repair rustfmt and lock drift before certification
ORESoftware Sep 13, 2026
46c5e26
build: repair locked zed-cli build
github-actions[bot] Sep 13, 2026
83ebb30
chore: remove one-shot repair workflow
ORESoftware Sep 13, 2026
344d432
test: remove duplicate registry_for import
ORESoftware Sep 13, 2026
70e02eb
fix: restore canonical CLI flags contract metadata
ORESoftware Sep 13, 2026
9ffbb76
fix: keep CLI flags metadata in its separate canonical contract
ORESoftware Sep 13, 2026
611da95
test: align CLI flags contract with zed-interfaces manifest authority
ORESoftware Sep 13, 2026
e97a0cb
fix: do not require an unpublished package lock in smoke validation
ORESoftware Sep 13, 2026
92a04b6
build: semantically reconcile locked-build repair with current main
ORESoftware Sep 15, 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
18 changes: 9 additions & 9 deletions tests/toml_contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ fn root() -> PathBuf {
fn parse_toml(path: &Path) -> toml::Value {
let text = fs::read_to_string(path)
.unwrap_or_else(|error| panic!("failed to read {}: {error}", path.display()));
toml::from_str(&text)
.unwrap_or_else(|error| panic!("invalid TOML {}: {error}", path.display()))
toml::from_str(&text).unwrap_or_else(|error| panic!("invalid TOML {}: {error}", path.display()))
}

fn string_at<'a>(value: &'a toml::Value, path: &[&str]) -> &'a str {
Expand Down Expand Up @@ -58,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 Expand Up @@ -133,7 +130,10 @@ fn global_flags_do_not_reuse_environment_keys_or_public_aliases() {
if alias == canonical_alias {
continue;
}
assert!(aliases.insert(alias.to_owned()), "duplicate global flag alias: {alias}");
assert!(
aliases.insert(alias.to_owned()),
"duplicate global flag alias: {alias}"
);
}
}
}
Expand Down
Loading