Skip to content

Commit f0755a6

Browse files
authored
Merge branch 'main' into tests-netns-reuse
2 parents c4c6229 + f610cae commit f0755a6

File tree

11 files changed

+138
-68
lines changed

11 files changed

+138
-68
lines changed

.buildkite/common.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ def __call__(self, parser, namespace, value, option_string=None):
139139
res = getattr(namespace, self.dest, {})
140140
key_str, val = value.split("=", maxsplit=1)
141141
keys = key_str.split("/")
142-
update = {keys[-1]: ast.literal_eval(val)}
142+
# Interpret it as a literal iff it starts like one
143+
update = {keys[-1]: ast.literal_eval(val) if val[0] in "[{'" else val}
143144
for key in list(reversed(keys))[1:]:
144145
update = {key: update}
145146
res = overlay_dict(res, update)

Cargo.lock

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

src/acpi-tables/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "Apache-2.0"
1010
displaydoc = "0.2.5"
1111
thiserror = "2.0.9"
1212
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
13-
zerocopy = { version = "0.8.13", features = ["derive"] }
13+
zerocopy = { version = "0.8.14", features = ["derive"] }
1414

1515
[lib]
1616
bench = false

src/clippy-tracing/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ bench = false
1111

1212
[dependencies]
1313
clap = { version = "4.5.23", features = ["derive"] }
14-
itertools = "0.13.0"
14+
itertools = "0.14.0"
1515
proc-macro2 = { version = "1.0.92", features = ["span-locations"] }
16-
quote = "1.0.37"
17-
syn = { version = "2.0.91", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
16+
quote = "1.0.38"
17+
syn = { version = "2.0.95", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
1818
walkdir = "2.5.0"
1919

2020
[dev-dependencies]

src/cpu-template-helper/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ clap = { version = "4.5.23", features = ["derive", "string"] }
1414
displaydoc = "0.2.5"
1515
libc = "0.2.169"
1616
log-instrument = { path = "../log-instrument", optional = true }
17-
serde = { version = "1.0.216", features = ["derive"] }
17+
serde = { version = "1.0.217", features = ["derive"] }
1818
serde_json = "1.0.134"
1919
thiserror = "2.0.9"
2020

src/firecracker/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ log-instrument = { path = "../log-instrument", optional = true }
2323
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
2424

2525
seccompiler = { path = "../seccompiler" }
26-
serde = { version = "1.0.216", features = ["derive"] }
26+
serde = { version = "1.0.217", features = ["derive"] }
2727
serde_derive = "1.0.136"
2828
serde_json = "1.0.134"
2929
thiserror = "2.0.9"
@@ -38,13 +38,13 @@ libc = "0.2.169"
3838
regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }
3939

4040
# Dev-Dependencies for uffd examples
41-
serde = { version = "1.0.216", features = ["derive"] }
41+
serde = { version = "1.0.217", features = ["derive"] }
4242
userfaultfd = "0.8.1"
4343

4444
[build-dependencies]
4545
bincode = "1.2.1"
4646
seccompiler = { path = "../seccompiler" }
47-
serde = { version = "1.0.216" }
47+
serde = { version = "1.0.217" }
4848
serde_json = "1.0.134"
4949

5050
[features]

src/log-instrument-macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ bench = false
1212

1313
[dependencies]
1414
proc-macro2 = "1.0.92"
15-
quote = "1.0.37"
16-
syn = { version = "2.0.91", features = ["full", "extra-traits"] }
15+
quote = "1.0.38"
16+
syn = { version = "2.0.95", features = ["full", "extra-traits"] }
1717

1818
[lints]
1919
workspace = true

src/seccompiler/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bincode = "1.2.1"
2020
displaydoc = "0.2.5"
2121
libc = "0.2.169"
2222
log-instrument = { path = "../log-instrument", optional = true }
23-
serde = { version = "1.0.216", features = ["derive"] }
23+
serde = { version = "1.0.217", features = ["derive"] }
2424
serde_json = "1.0.134"
2525
thiserror = "2.0.9"
2626

src/vmm/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
3333

3434
seccompiler = { path = "../seccompiler" }
3535
semver = { version = "1.0.24", features = ["serde"] }
36-
serde = { version = "1.0.216", features = ["derive", "rc"] }
36+
serde = { version = "1.0.217", features = ["derive", "rc"] }
3737
serde_json = "1.0.134"
3838
slab = "0.4.7"
3939
thiserror = "2.0.9"
@@ -45,15 +45,15 @@ vm-allocator = "0.1.0"
4545
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
4646
vm-superio = "0.8.0"
4747
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
48-
zerocopy = { version = "0.8.13" }
48+
zerocopy = { version = "0.8.14" }
4949

5050
[target.'cfg(target_arch = "aarch64")'.dependencies]
5151
vm-fdt = "0.3.0"
5252

5353
[dev-dependencies]
5454
criterion = { version = "0.5.0", default-features = false }
5555
device_tree = "1.1.0"
56-
itertools = "0.13.0"
56+
itertools = "0.14.0"
5757
proptest = { version = "1.6.0", default-features = false, features = ["std"] }
5858

5959
[features]

0 commit comments

Comments
 (0)