Skip to content

Commit 8149f3f

Browse files
committed
integration test runs again
1 parent 1dd9bff commit 8149f3f

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.github/workflows/integrationtest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ jobs:
4444
key: ${{ runner.os }}-${{ github.job }}-${{ hashFiles('integration-test/**/Cargo.toml', 'integration-test/**/Cargo.lock', 'integration-test/bins/rust-toolchain.toml') }}
4545
# Have all the "copying into Nix store" messages in a dedicated step for
4646
# better log visibility.
47-
- run: cd integration-test && nix-shell --run "echo OK" && cd ..
47+
- run: nix-shell --run "echo OK"
4848
# Now, run the actual test.
49-
- run: cd integration-test && nix-shell --run ./run.sh && cd ..
49+
- run: nix-shell --run run-integrationtest

integration-test/bins/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-2024-03-31" # rustc 1.79-nightly
2+
channel = "nightly-2024-04-30" # rustc 1.80-nightly
33
profile = "default"
44
components = [
55
"rust-src",

integration-test/run.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ function fn_main() {
1515

1616
function fn_build_rust_bins() {
1717
cd "bins"
18-
cargo build --release
18+
cargo --version
19+
cargo build --release --verbose
1920
cd "$DIR"
2021
}
2122

shell.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ pkgs.mkShell rec {
1313
grub2
1414
qemu
1515
xorriso
16+
17+
(pkgs.writeShellScriptBin "run-integrationtest" ''
18+
./integration-test/run.sh
19+
'')
1620
];
1721

1822
# To invoke "nix-shell" in the CI-runner, we need a global Nix channel.

0 commit comments

Comments
 (0)