From cf58890f3aee79b2b5c28a058d523b8417d272ba Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 6 Dec 2024 15:52:20 -0500 Subject: [PATCH] build-sys: Also take over ostree hooks in our own CI builds This helps ensure our CI is covering our copy of ostree-ext, not the one currently vendored in rpm-ostree. Signed-off-by: Colin Walters --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 41a6454c6..1a96f63a8 100644 --- a/Makefile +++ b/Makefile @@ -34,14 +34,15 @@ install-ostree-hooks: ln -sf ../../../bin/bootc $(DESTDIR)$(prefix)/libexec/libostree/ext/$$x; \ done -install-with-tests: install +# Install the main binary, the ostree hooks, and the integration test suite. +install-all: install install-ostree-hooks install -D -m 0755 target/release/tests-integration $(DESTDIR)$(prefix)/bin/bootc-integration-tests bin-archive: all $(MAKE) install DESTDIR=tmp-install && $(TAR_REPRODUCIBLE) --zstd -C tmp-install -cf target/bootc.tar.zst . && rm tmp-install -rf test-bin-archive: all - $(MAKE) install-with-tests DESTDIR=tmp-install && $(TAR_REPRODUCIBLE) --zstd -C tmp-install -cf target/bootc.tar.zst . && rm tmp-install -rf + $(MAKE) install-all DESTDIR=tmp-install && $(TAR_REPRODUCIBLE) --zstd -C tmp-install -cf target/bootc.tar.zst . && rm tmp-install -rf test-tmt: cargo xtask test-tmt