Skip to content

Commit

Permalink
.github: enable ndctl build
Browse files Browse the repository at this point in the history
As --ndctl-build is on by default, the "real" way to enable ndctl is to
define $ndctl.

Add --ndctl-build anyway in case the default ever changes.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
  • Loading branch information
marc-hb committed Dec 12, 2024
1 parent be57ccc commit bc6aa47
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
img_distro: ubuntu
img_rel: noble
arch: [x86_64]
run_opts: [--cxl]
run_opts: [--cxl --ndctl-build]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -79,6 +79,13 @@ jobs:
sudo apt install -y autoconf
sudo make -C argbash-${AB_VER}/resources install PREFIX=/usr/local/
- name: download ndctl
uses: actions/checkout@v4
with:
repository: pmem/ndctl
ref: v80
path: ndctl

- name: download kernel
uses: actions/checkout@v4
with:
Expand All @@ -105,6 +112,7 @@ jobs:
mkosi --version
cd kernel
distro=${{ matrix.cfg.img_distro }} rev=${{ matrix.cfg.img_rel }} \
ndctl='${{ github.workspace }}'/ndctl \
../run_qemu/run_qemu.sh -v --no-run ${{ matrix.run_opts }}
# TODO: drop --no-run thanks to "nested KVM" or something?
2 changes: 1 addition & 1 deletion run_qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ prepare_ndctl_build()
mkosi.extra/root/ndctl/
cat <<- 'EOF' > mkosi.postinst
# v14: 'systemd-nspawn"; v15: "mkosi"
declare -p container || true
printf 'container=%s\n' "$container"
# .postinst and others moved outside container in mkosi v15, see
# https://github.com/systemd/mkosi/commit/9b626c647037bc8a
if [ -n "$container" ]; then
Expand Down

0 comments on commit bc6aa47

Please sign in to comment.