Skip to content

Commit 5532694

Browse files
bors[bot]mkroening
andauthored
Merge #271
271: Upgrade nightly version of hermit to nightly-2021-08-31 r=stlankes a=mkroening Closes #269, #265. Co-authored-by: Martin Kröning <[email protected]>
2 parents 59f1200 + 1487618 commit 5532694

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ test:integration:
6363
- lscpu
6464
- kvm-ok
6565
- python3 --version
66-
- cargo install uhyve
66+
- cargo install uhyve --locked
6767
- HERMIT_LOG_LEVEL_FILTER=Debug cargo test --test '*' --no-fail-fast -Z build-std=core,alloc
6868
-Z build-std-features=compiler-builtins-mem --no-default-features --features=pci,acpi
6969
--target x86_64-unknown-none-hermitkernel -- --uhyve_path=$HOME/.cargo/bin/uhyve --veryverbose
@@ -83,7 +83,7 @@ test:uhyve:
8383
script:
8484
- lscpu
8585
- kvm-ok
86-
- cargo install uhyve
86+
- cargo install uhyve --locked
8787
- uhyve -v -c 1 rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo
8888
- uhyve -v -c 2 rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo
8989
- uhyve -v -c 1 rusty-hermit/target/x86_64-unknown-hermit/release/rusty_demo

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "nightly-2021-05-19"
2+
channel = "nightly-2021-08-31"
33
components = [
44
"rust-src",
55
"llvm-tools-preview",

0 commit comments

Comments
 (0)