integration test runs again

rust-osdev · May 1, 2024 · 8149f3f · 8149f3f
1 parent 1dd9bff
commit 8149f3f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/integrationtest.yml b/.github/workflows/integrationtest.yml
@@ -44,6 +44,6 @@ jobs:
           key: ${{ runner.os }}-${{ github.job }}-${{ hashFiles('integration-test/**/Cargo.toml', 'integration-test/**/Cargo.lock', 'integration-test/bins/rust-toolchain.toml') }}
       # Have all the "copying into Nix store" messages in a dedicated step for
       # better log visibility.
-      - run: cd integration-test && nix-shell --run "echo OK" && cd ..
+      - run: nix-shell --run "echo OK"
       # Now, run the actual test.
-      - run: cd integration-test && nix-shell --run ./run.sh && cd ..
+      - run: nix-shell --run run-integrationtest
diff --git a/integration-test/bins/rust-toolchain.toml b/integration-test/bins/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-03-31" # rustc 1.79-nightly
+channel = "nightly-2024-04-30" # rustc 1.80-nightly
 profile = "default"
 components = [
     "rust-src",

diff --git a/integration-test/run.sh b/integration-test/run.sh
@@ -15,7 +15,8 @@ function fn_main() {
 
 function fn_build_rust_bins() {
     cd "bins"
-    cargo build --release
+    cargo --version
+    cargo build --release --verbose
     cd "$DIR"
 }
 

diff --git a/shell.nix b/shell.nix
@@ -13,6 +13,10 @@ pkgs.mkShell rec {
     grub2
     qemu
     xorriso
+
+    (pkgs.writeShellScriptBin "run-integrationtest" ''
+    ./integration-test/run.sh
+    '')
   ];
 
   # To invoke "nix-shell" in the CI-runner, we need a global Nix channel.
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,10 @@ pkgs.mkShell rec { @@
         grub2
         qemu
         xorriso
+        (pkgs.writeShellScriptBin "run-integrationtest" ''
+        ./integration-test/run.sh
+        '')
       ];
       # To invoke "nix-shell" in the CI-runner, we need a global Nix channel.
@@ Expand Down @@