Skip to content

Support glob patterns in copy-to-archive #2432

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
mkeeter merged 2 commits into from
Mar 11, 2026
+26 −13
Merged

Support glob patterns in copy-to-archive #2432

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
5bb057d
Remove unused config block
mkeeter Mar 10, 2026
92504f5
Support glob patterns in copy-to-archive
mkeeter Mar 10, 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
9 changes: 8 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ fletcher = { version = "0.3", default-features = false }
fnv = { version = "1.0.7", default-features = false }
getrandom = { version = "0.2", default-features = false }
goblin = { version = "0.4.3", default-features = true } # goblin::Object doesn't work without everything enabled
glob = { version = "0.3.3", default-features = false }
heapless = { version = "0.7.17", default-features = false }
heck = { version = "0.5.0", default-features = false }
hkdf = { version = "0.12", default-features = false }
Expand Down
6 changes: 2 additions & 4 deletions app/cosmo/base.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,16 +202,14 @@ max-sizes = {flash = 131072, ram = 16384 }
stacksize = 2600
start = true
task-slots = ["sys", {spi = "spi2_driver"}, "auxflash"]
copy-to-archive = ["register_defs"]

[tasks.spartan7_loader.config]
program_l = "sys_api::Port::B.pin(1)"
init_l = "sys_api::Port::B.pin(6)"
config_done = "sys_api::Port::B.pin(4)"
user_reset_l = "sys_api::Port::A.pin(6)"

[tasks.cosmo_seq.config]
fpga_image = "cosmo-a.bin"
register_defs = "cosmo-regs-a.json"
Comment on lines -211 to -214
Copy link
Copy Markdown
Collaborator

@labbott labbott Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find this anywhere so I think it's just cruft?

Copy link
Copy Markdown
Collaborator Author

@mkeeter mkeeter Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's why I deleted it 😄

register_defs = "cosmo-seq/*.json"

[tasks.hash_driver]
name = "drv-stm32h7-hash-server"
Expand Down
1 change: 1 addition & 0 deletions build/xtask/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ directories = { workspace = true }
dunce = { workspace = true }
filetime = { workspace = true }
fnv = { workspace = true }
glob = { workspace = true }
goblin = { workspace = true }
hex = "0.4"
hubtools = { workspace = true }
Expand Down
22 changes: 14 additions & 8 deletions build/xtask/src/dist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,14 +955,20 @@ fn build_archive(
let dir = pkg.manifest_path.parent().unwrap();

let f = dir.join(s);
let task_dir = PathBuf::from("task").join(name).join(s);
archive.copy(f, task_dir).with_context(|| {
format!(
"task {name}: failed to copy \"{s}\" in {} \
into the archive",
dir.display()
)
})?;
let task_dir = PathBuf::from("task").join(name);
for f in glob::glob(f.to_str().unwrap())? {
let f = f?;
let task_file = f.strip_prefix(dir)?;
archive
.copy(&f, task_dir.join(task_file))
.with_context(|| {
format!(
"task {name}: failed to copy \"{s}\" in {} \
into the archive",
dir.display()
)
})?;
}
}
Some(_) => {
bail!(
Expand Down
Loading