Skip to content
Open
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
1 change: 1 addition & 0 deletions anneal/Cargo.lock

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

7 changes: 4 additions & 3 deletions anneal/v2/toolchain-config/examples/static-toml/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@ toolchain-config = { path = "../.." }
clap = { version = "4.6", features = ["derive"] }
sha2 = "0.10"
dirs = "6.0"
toml_const = "1.2.1"

[build-dependencies]
toml = "0.8"

[package.metadata.toolchain.linux.x86_64]
[package.toolchain.linux.x86_64]
checksum = "1111111111111111111111111111111111111111111111111111111111111111"
url = "http://example.com/linux.x86_64.tar.zst"

[package.metadata.toolchain.macos.aarch64]
[package.toolchain.macos.aarch64]
checksum = "2222222222222222222222222222222222222222222222222222222222222222"
url = "http://example.com/macos.aarch64.tar.zst"

[package.metadata.toolchain.windows.x86_64]
[package.toolchain.windows.x86_64]
checksum = "3333333333333333333333333333333333333333333333333333333333333333"
url = "http://example.com/windows.x86_64.tar.zst"
1 change: 0 additions & 1 deletion anneal/v2/toolchain-config/examples/static-toml/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ fn main() {

let metadata = toml
.get("package")
.and_then(|p| p.get("metadata"))
.and_then(|m| m.get("toolchain"))
.expect("Missing [package.metadata.toolchain] in Cargo.toml");

Expand Down
17 changes: 11 additions & 6 deletions anneal/v2/toolchain-config/examples/static-toml/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use clap::{Parser, Subcommand};
use sha2::Digest;
use std::process::Command;
use toolchain_config::{Checksum, Config, LocalOverride, RemoteArchive, TarZstLibraryExtractor};

Expand All @@ -25,19 +26,23 @@ fn get_root_dir() -> std::path::PathBuf {
home.join(".toolchain-config-example-static-toml").join("toolchain")
}

toolchain_config::auto_install!{
pub const AUTO_CONFIG = "Cargo.toml";
}

fn main() {
let cli = Cli::parse();
let root_dir = get_root_dir();

let checksum_bytes = decode_hex(env!("TOOLCHAIN_CHECKSUM"));
let config = Config::<TarZstLibraryExtractor, sha2::Sha256>::new(
RemoteArchive::new(env!("TOOLCHAIN_URL")),
Checksum::new(&checksum_bytes),
let mut hasher = sha2::Sha256::new();
let mut config = Config::new(
RemoteArchive::new(env!("TOOLCHAIN_URL"), &TarZstLibraryExtractor),
Checksum::new(&checksum_bytes, &mut hasher),
);

match cli.command {
Commands::Install => {
// TODO: Probably use a flag, not an environment variable to activate override.
let archive_path;
let local_override = if std::env::var("__TOOLCHAIN_EXAMPLE_STATIC_TOML").is_ok() {
println!("Local testing override active. Assembling mock toolchain archive...");
Expand All @@ -51,13 +56,13 @@ fn main() {
assert!(status.success(), "build-toolchain.sh script failed");

archive_path = std::path::Path::new(&manifest_dir).join("toolchain.tar.zst");
Some(LocalOverride::<TarZstLibraryExtractor>::archive(&archive_path))
Some(LocalOverride::archive(&archive_path, &TarZstLibraryExtractor))
} else {
None
};

println!("Provisioning toolchain environment...");
toolchain_config::install(&config, local_override, &root_dir)
toolchain_config::install_config(&mut config, local_override, &root_dir)
.expect("Setup subcommand failed");
println!("Toolchain successfully set up.");
}
Expand Down
Binary file not shown.
Loading
Loading