Skip to content

Commit

Permalink
Problem: CI fails due to incorrect SHA256 dependency hash
Browse files Browse the repository at this point in the history
Solution: insert the correct hash, but also include other
modifications such as splitting out cli into its own dir.
  • Loading branch information
sjmackenzie committed Apr 10, 2017
1 parent 2049dfe commit 56e747f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ crate-type = ["rlib", "dylib"]

[[bin]]
name = "svm"
path = "./src/bin/cli.rs"
path = "./src/bin/cli/mod.rs"

[[bin]]
name = "gaslighter"
Expand All @@ -23,4 +23,4 @@ clap = "2.22"
log = "0.3"
capnp = "0.8"
ring = "^0.6.0"
merkle = "1.1.0"
merkle = "1.1.0"
6 changes: 3 additions & 3 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ sputnikvm = rustPlatform.buildRustPackage (rec {
name = "sputnikvm-${version}";
version = "0.1.0";
src = ./.;
depsSha256 = "14i5gh4fvg4fpnirwrzmgycxqm118p1p5c1mnf386223vdg2qisp";
buildInputs = [ capnproto ];
depsSha256 = "040h1s26n5nf8d2sw13lnvd93l5imyg2l6lvmam57ghgvl0rrjc3";
buildInputs = [ capnproto perl ];
doCheck = true;
checkPhase = ''
${capnproto}/bin/capnp eval -b tests/mod.capnp all >> tests.bin
cargo test
target/release/gaslighter --capnp_test_bin tests.bin --artefact_dir target/release/
target/release/gaslighter --capnp_test_bin tests.bin --run_test ///
'';
});
in {
Expand Down
File renamed without changes.
3 changes: 1 addition & 2 deletions src/bin/gaslighter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,9 @@ fn main() {
Some(c) => c,
None => "",
};
println!("capnp_test_bin: {:?}", capnp_test_bin);
let path = Path::new(capnp_test_bin);
let display = path.display();
let mut file = match File::open(&path) {
let file = match File::open(&path) {
Err(_) => panic!("couldn't open {}", display),
Ok(file) => file,
};
Expand Down

0 comments on commit 56e747f

Please sign in to comment.