@@ -6,6 +6,8 @@ apk update
apk add \
acl-dev \
+ asciidoc \
+ asciidoctor \
autoconf \
automake \
clang \
@@ -23,6 +25,7 @@ apk add \
musl-dev \
numactl-dev \
openssl-dev \
+ perl-json \
pkgconfig
cat /etc/os-release
@@ -2,7 +2,11 @@
# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
set -ex
-apt remove -y \
+apt="apt remove -y"
+
+$apt \
+ asciidoc \
+ asciidoctor \
libacl1-dev \
libaio-dev \
libaio1 \
@@ -17,3 +21,5 @@ apt remove -y \
libsepol1-dev \
libssl-dev \
libtirpc-dev
+
+$apt asciidoc-base ruby-asciidoctor || true
@@ -8,8 +8,12 @@ grep -v oldstable-updates /etc/apt/sources.list > /tmp/sources.list && mv /tmp/s
apt update
-apt install -y --no-install-recommends \
+apt="apt install -y --no-install-recommends"
+
+$apt \
acl-dev \
+ asciidoc \
+ asciidoctor \
autoconf \
automake \
build-essential \
@@ -26,6 +30,7 @@ apt install -y --no-install-recommends \
libcap2 \
libc6 \
libc6-dev \
+ libjson-perl \
libkeyutils-dev \
libkeyutils1 \
libmm-dev \
@@ -40,4 +45,6 @@ apt install -y --no-install-recommends \
lsb-release \
pkg-config
+$apt ruby-asciidoctor-pdf || true
+
df -hT
@@ -2,7 +2,10 @@
# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
set -ex
-yum -y install \
+yum="yum -y install"
+
+$yum \
+ asciidoc \
autoconf \
automake \
make \
@@ -12,8 +15,11 @@ yum -y install \
findutils \
libtirpc \
libtirpc-devel \
+ perl-JSON \
+ perl-libwww-perl \
pkg-config \
redhat-lsb-core
-# CentOS 8 doesn't have libmnl-devel
-yum -y install libmnl-devel || yum -y install libmnl
+# CentOS 8 fixes
+$yum libmnl-devel || $yum libmnl
+$yum rubygem-asciidoctor || true
@@ -2,7 +2,10 @@
# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
set -ex
-zypper --non-interactive install --force-resolution --no-recommends \
+zyp="zypper --non-interactive install --force-resolution --no-recommends"
+
+$zyp \
+ asciidoc \
autoconf \
automake \
clang \
@@ -23,4 +26,7 @@ zypper --non-interactive install --force-resolution --no-recommends \
libtirpc-devel \
linux-glibc-devel \
lsb-release \
+ perl-JSON \
pkg-config
+
+$zyp ruby2.7-rubygem-asciidoctor || $zyp ruby2.5-rubygem-asciidoctor
Signed-off-by: Petr Vorel <pvorel@suse.cz> --- travis/alpine.sh | 3 +++ travis/debian.minimal.sh | 8 +++++++- travis/debian.sh | 9 ++++++++- travis/fedora.sh | 12 +++++++++--- travis/tumbleweed.sh | 8 +++++++- 5 files changed, 34 insertions(+), 6 deletions(-)