Skip to content

Commit 5d5d63d

Browse files
authored
Merge branch 'main' into memory-cleanup
2 parents cdb2603 + 0d2713b commit 5d5d63d

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/snapshot-editor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ vmm = { path = "../vmm" }
2222
vmm-sys-util = "0.12.1"
2323

2424
[target.'cfg(target_arch = "aarch64")'.dependencies]
25-
clap-num = "1.0.2"
25+
clap-num = "1.2.0"
2626

2727
[features]
2828
tracing = ["log-instrument", "fc_utils/tracing", "vmm/tracing"]

tests/integration_tests/build/test_coverage.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ def test_coverage(monkeypatch):
9595
if not branch:
9696
branch = utils.check_output("git rev-parse --abbrev-ref HEAD").stdout
9797

98-
codecov_cmd = f"codecov -f {lcov_file} -F {global_props.host_linux_version}-{global_props.instance}"
98+
# -Z flag means "fail on error". There's supposed to be a more descriptive long form in
99+
# --fail-on-error, but it doesnt work.
100+
codecov_cmd = f"codecov -Z -f {lcov_file} -F {global_props.host_linux_version}-{global_props.instance}"
99101

100102
if pr_number and pr_number != "false":
101103
codecov_cmd += f" -P {pr_number}"

0 commit comments

Comments
 (0)