From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH 09/11] travis: Install docparse dependencies
Date: Mon, 5 Oct 2020 15:30:52 +0200 [thread overview]
Message-ID: <20201005133054.23587-10-chrubis@suse.cz> (raw)
In-Reply-To: <20201005133054.23587-1-chrubis@suse.cz>
From: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
travis/alpine.sh | 3 +++
travis/debian.minimal.sh | 8 +++++++-
travis/debian.sh | 9 ++++++++-
travis/fedora.sh | 11 ++++++++---
travis/tumbleweed.sh | 8 +++++++-
5 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/travis/alpine.sh b/travis/alpine.sh
index f8960bed0..b793a9fbe 100755
--- a/travis/alpine.sh
+++ b/travis/alpine.sh
@@ -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
diff --git a/travis/debian.minimal.sh b/travis/debian.minimal.sh
index 3f1941969..5e6ba8662 100755
--- a/travis/debian.minimal.sh
+++ b/travis/debian.minimal.sh
@@ -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
diff --git a/travis/debian.sh b/travis/debian.sh
index 28685f4d3..743b79001 100755
--- a/travis/debian.sh
+++ b/travis/debian.sh
@@ -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
diff --git a/travis/fedora.sh b/travis/fedora.sh
index 3c224f71e..6127d367d 100755
--- a/travis/fedora.sh
+++ b/travis/fedora.sh
@@ -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,10 @@ yum -y install \
findutils \
libtirpc \
libtirpc-devel \
+ perl-JSON \
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
diff --git a/travis/tumbleweed.sh b/travis/tumbleweed.sh
index 6247daa98..43ca3252a 100755
--- a/travis/tumbleweed.sh
+++ b/travis/tumbleweed.sh
@@ -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
--
2.26.2
next prev parent reply other threads:[~2020-10-05 13:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-05 13:30 [LTP] [PATCH 00/11] Test metadata extraction Cyril Hrubis
2020-10-05 13:30 ` [LTP] [PATCH 01/11] make: Support compiling native build tools Cyril Hrubis
2020-10-05 13:30 ` [LTP] [PATCH 02/11] travis: Add git Cyril Hrubis
2020-10-05 13:30 ` [LTP] [PATCH 03/11] docparse: Add test documentation parser Cyril Hrubis
2020-10-23 7:01 ` Li Wang
2020-10-23 9:36 ` Li Wang
2020-10-05 13:30 ` [LTP] [PATCH 04/11] docparse: Add README Cyril Hrubis
2020-10-05 14:15 ` Jan Stancek
2020-10-13 11:59 ` Cyril Hrubis
2020-10-05 13:30 ` [LTP] [PATCH 05/11] syscalls: Add a few documentation comments Cyril Hrubis
2020-10-05 13:30 ` [LTP] [PATCH 06/11] syscalls: Move needs_drivers inside of the tst_test struct Cyril Hrubis
2020-10-05 13:30 ` [LTP] [PATCH 07/11] make: Allow {INSTALL, MAKE}_TARGETS be a directory Cyril Hrubis
2020-10-05 13:30 ` [LTP] [PATCH 08/11] make: Allow CLEAN_TARGETS to remove directories Cyril Hrubis
2020-10-05 13:30 ` Cyril Hrubis [this message]
2020-10-21 10:38 ` [LTP] [PATCH 09/11] travis: Install docparse dependencies Li Wang
2020-10-05 13:30 ` [LTP] [PATCH 10/11] docparse: Add configure options Cyril Hrubis
2020-10-05 13:30 ` [LTP] [PATCH 11/11] docparse: Generate html and pdf using asciidoc{, tor} Cyril Hrubis
2020-10-23 6:18 ` Li Wang
2020-10-23 7:19 ` Petr Vorel
2020-10-05 13:35 ` [LTP] [PATCH 00/11] Test metadata extraction Cyril Hrubis
2020-10-12 8:53 ` Petr Vorel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201005133054.23587-10-chrubis@suse.cz \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox