Unverified Commit f4985faa authored by bors[bot]'s avatar bors[bot] Committed by GitHub
Browse files

Merge #271

271: Upgrade nightly version of hermit to nightly-2021-08-31 r=stlankes a=mkroening

Closes https://github.com/hermitcore/libhermit-rs/issues/269, https://github.com/hermitcore/libhermit-rs/issues/265

.
Co-authored-by: Martin Kröning's avatarMartin Kröning <mkroening@posteo.net>
parents 59f1200c 25a363ec
Pipeline #539297 passed with stages
in 19 minutes and 57 seconds
......@@ -56,7 +56,9 @@ jobs:
if: ${{ matrix.os == 'macos-latest' }}
run: |
brew update
brew install qemu
brew tap-new --no-git hermitcore/homebrew
brew extract --version 6.0.0 qemu hermitcore/homebrew
brew install hermitcore/homebrew/qemu@6.0.0
- name: Install QEMU, GNU make (windows)
if: ${{ matrix.os == 'windows-latest' }}
run: |
......
......@@ -55,7 +55,10 @@ jobs:
if: ${{ matrix.os == 'macos-latest' }}
run: |
brew update
brew install qemu nasm
brew tap-new --no-git hermitcore/homebrew
brew extract --version 6.0.0 qemu hermitcore/homebrew
brew install hermitcore/homebrew/qemu@6.0.0
brew install nasm
- name: Install QEMU, NASM, GNU make (windows)
if: ${{ matrix.os == 'windows-latest' }}
run: |
......
......@@ -63,7 +63,7 @@ test:integration:
- lscpu
- kvm-ok
- python3 --version
- cargo install uhyve
- cargo install uhyve --locked
- HERMIT_LOG_LEVEL_FILTER=Debug cargo test --test '*' --no-fail-fast -Z build-std=core,alloc
-Z build-std-features=compiler-builtins-mem --no-default-features --features=pci,acpi
--target x86_64-unknown-none-hermitkernel -- --uhyve_path=$HOME/.cargo/bin/uhyve --veryverbose
......@@ -83,7 +83,7 @@ test:uhyve:
script:
- lscpu
- kvm-ok
- cargo install uhyve
- cargo install uhyve --locked
- uhyve -v -c 1 rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo
- uhyve -v -c 2 rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo
- uhyve -v -c 1 rusty-hermit/target/x86_64-unknown-hermit/release/rusty_demo
......
[toolchain]
channel = "nightly-2021-05-19"
channel = "nightly-2021-08-31"
components = [
"rust-src",
"llvm-tools-preview",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment