diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87e71273b..3f1d7b5fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -311,6 +311,12 @@ jobs: sh -c "dpkg --fsys-tarfile {} | tar -C test/.tmp \ --wildcards --extract '*boot*' '**/modules/*' --file -" + - name: DELETEME - List debian kernels + run: find test/.tmp -name 'vmlinuz-*' + + - name: DELETEME - List debian kernel modules + run: find test/.tmp -maxdepth 5 -type d -ipath '*modules*' + - name: Run local integration tests if: runner.os == 'Linux' run: cargo xtask integration-test local diff --git a/xtask/src/run.rs b/xtask/src/run.rs index a9fd8324d..1d7b49148 100644 --- a/xtask/src/run.rs +++ b/xtask/src/run.rs @@ -308,13 +308,20 @@ pub fn run(opts: Options) -> Result<()> { .and_then(|name| name.to_str()) .ok_or_else(|| anyhow!("kernel_image file_name failed"))?; let version = version.trim_start_matches("vmlinuz-"); - let modules_dir = kernel_image + let parent = kernel_image .parent() - .expect("unable to get parent directory from kernel_image") + .expect("unable to get parent directory from kernel_image"); + let modules_dir = parent .join("../usr/lib/modules/") .join(version) .canonicalize() - .with_context(|| format!("failed to canonicalize {version}"))?; + .with_context(|| { + format!( + "failed to canonicalize {}../usr/lib/modules/{}", + parent.display(), + version + ) + })?; let binaries = binaries(Some(&target))?;