From 5e65615ced0df8d8e6548bc4e56867a4fd8c89fb Mon Sep 17 00:00:00 2001
From: Philipp Schuster <phip1611@gmail.com>
Date: Wed, 1 May 2024 18:29:24 +0200
Subject: [PATCH] integration test runs again

---
 .github/workflows/integrationtest.yml     | 4 ++--
 integration-test/bins/rust-toolchain.toml | 2 +-
 integration-test/run.sh                   | 3 ++-
 shell.nix                                 | 4 ++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integrationtest.yml b/.github/workflows/integrationtest.yml
index 5f07017e..13de84fd 100644
--- 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
index 6cd890fc..4349337f 100644
--- 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
index 318557b5..9f4fd36c 100755
--- 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
index 1e3e1a43..178c58af 100644
--- 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.