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 build.zig.zon
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.{
.fingerprint = 0xa3d95bf7b905a401,
.name = .labelle_cli,
.version = "4.1.1",
.version = "4.1.2",
.minimum_zig_version = "0.16.0",
.dependencies = .{
// Issue #217: labelle-cli is a thin driver over the standalone
Expand Down
6 changes: 4 additions & 2 deletions test/provider_hooks_e2e.py
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,9 @@ def by_id(step_dir):
# plan with a hook that may contribute is refused before anything runs:
# no hook, no generation, no build.
reset()
refused = run("build", "--docker", code=1, extra_env=probe_env)
# Choose a container-supported target explicitly; a Mac host otherwise
# fails target validation before reaching the contribution guard.
refused = run("build", "--docker", "--target=x86_64-linux", code=1, extra_env=probe_env)
assert "hook 'fixture-a/tc' may contribute an environment for target 'desktop'" in refused.stderr, refused.stderr
assert "--docker doesn't carry provider environment contributions; build without --docker" in refused.stderr, refused.stderr
assert "FIXTURE_GENERATE" not in refused.stderr and not log(target_dir) and not log(zig_out), refused.stderr
Expand All @@ -932,7 +934,7 @@ def by_id(step_dir):
replaced_dir = project / ".labelle" / "raylib_android"
a_manifest.write_text(manifest("fixture-a", [hook("tc", "generate", "before", target="android"),
hook("build-owned", "build", "replace", target="android")], targets=["android"]))
for docker_args in (("build", "--platform=android", "--docker"), ("generate", "--platform=android", "--docker")):
for docker_args in (("build", "--platform=android", "--docker", "--target=x86_64-linux"), ("generate", "--platform=android", "--docker")):
reset()
refused = run(*docker_args, code=1, extra_env=contributing)
assert "--docker builds the `desktop` target only" in refused.stderr, (docker_args, refused.stderr)
Expand Down
4 changes: 3 additions & 1 deletion test/provider_targets_e2e.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,9 @@ def installed_only(result, target):
# `--docker` builds the core target only (RFC cli#466 D5): a provider
# target is refused before resolution, so before the no-provider verdict
# and before anything is installed or generated.
for args in (("build", "--docker", "--platform=wasm"), ("run", "--docker", "--platform=probe-target"),
# A Mac's default target is rejected before provider resolution. Use a
# supported container target to exercise the provider-target guard.
for args in (("build", "--docker", "--platform=wasm", "--target=x86_64-linux"), ("run", "--docker", "--platform=probe-target", "--target=x86_64-linux"),
("generate", "--docker", "--platform=probe-target")):
refused = run(*args, code=1)
assert "--docker builds the `desktop` target only" in refused.stderr, (args, refused.stderr)
Expand Down
Loading