Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:

sudo add-apt-repository -y ppa:criu/ppa
# add-apt-repository runs apt-get update so we don't have to.
sudo apt-get install -q -y criu automake libtool autotools-dev libseccomp-dev git make libcap-dev cmake pkg-config gcc wget libsystemd-dev gperf clang-format libjson-c-dev containerd runc libasan6 libubsan1 libprotobuf-c-dev mawk python3-dev lua5.4 liblua5.4-dev
sudo apt-get install -q -y criu libcriu-dev automake libtool autotools-dev libseccomp-dev git make libcap-dev cmake pkg-config gcc wget libsystemd-dev gperf clang-format libjson-c-dev containerd runc libasan6 libubsan1 libprotobuf-c-dev mawk python3-dev lua5.4 liblua5.4-dev
# Fedora (used by maintainers as well as for packaging) has newer
# md2man than in Ubuntu, so we have to install it from source.
GOBIN=~/.local/bin go install github.com/cpuguy83/go-md2man/v2@latest
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
run: |
sudo add-apt-repository -y ppa:criu/ppa
# add-apt-repository runs apt-get update so we don't have to.
sudo apt-get install -q -y criu automake libtool autotools-dev libseccomp-dev git make libcap-dev pkg-config gcc libsystemd-dev gperf libjson-c-dev libprotobuf-c-dev mawk sshfs uidmap
sudo apt-get install -q -y criu libcriu-dev automake libtool autotools-dev libseccomp-dev git make libcap-dev pkg-config gcc libsystemd-dev gperf libjson-c-dev libprotobuf-c-dev mawk sshfs uidmap

- name: install bats
uses: bats-core/bats-action@77d6fb60505b4d0d1d73e48bd035b55074bbfb43 # 4.0.0
Expand Down
3 changes: 2 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,10 @@ AS_IF([test "x$use_fPIC" = "xyes"], [
])

dnl criu
AC_ARG_ENABLE([criu], AS_HELP_STRING([--disable-criu], [Disable CRIU based checkpoint/restore support]))
AC_ARG_ENABLE([criu], AS_HELP_STRING([--enable-criu], [CRIU based checkpoint/restore support (yes/no, default: autodetect)]))
AS_IF([test "x$enable_criu" != "xno"], [
PKG_CHECK_MODULES([CRIU], [criu >= 3.15], [have_criu="yes"], [have_criu="no"
AS_IF([test "x$enable_criu" = "xyes"], [AC_MSG_ERROR([*** CRIU headers not found; install libcriu or use --disable-criu])])
AC_MSG_NOTICE([CRIU headers not found, building without CRIU support])])
PKG_CHECK_MODULES([CRIU_JOIN_NS], [criu > 3.16], [have_criu_join_ns="yes"], [have_criu_join_ns="no"
AC_MSG_NOTICE([CRIU version doesn't support join-ns API])])
Expand Down
2 changes: 1 addition & 1 deletion tests/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dump_log() {

# Configure and build, with any extra configure arguments in "$@".
build() {
group configure ./configure --enable-embedded-blake3 --enable-werror "$@"
group configure ./configure --enable-embedded-blake3 --enable-werror --enable-criu "$@"
group build make -j "$(nproc)"
}

Expand Down
Loading