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]>

Author: bors[bot]

.github/workflows/aarch64.yml

@@ -56,7 +56,7 @@ jobs:
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
           brew update
-          brew install qemu
+          brew install qemu@6.0
       - name: Install QEMU, GNU make (windows)
         if: ${{ matrix.os == 'windows-latest' }}
         run: |

.github/workflows/x86.yml

@@ -55,7 +55,7 @@ jobs:
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
           brew update
-          brew install qemu nasm
+          brew install qemu@6.0 nasm
       - name: Install QEMU, NASM, GNU make (windows)
         if: ${{ matrix.os == 'windows-latest' }}
         run: |

.gitlab-ci.yml

@@ -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

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2021-05-19"
+channel = "nightly-2021-08-31"
 components = [
     "rust-src",
     "llvm-tools-preview",