travis: Add set -x to print commands
to help debugging logs
+ cleanup .travis.yml
Signed-off-by: Petr Vorel <pvorel@suse.cz>
diff --git a/.travis.yml b/.travis.yml
index 1a30b9d..4fee82b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+# Copyright (c) 2017-2020 Petr Vorel <pvorel@suse.cz>
+
sudo: required
language: c
services:
@@ -12,11 +14,11 @@
# cross compilation builds
- os: linux
- env: DISTRO=debian:stable VARIANT=cross-compile.ppc64le TREE="out"
+ env: DISTRO=debian:stable VARIANT=cross-compile.ppc64le TREE=out
compiler: powerpc64le-linux-gnu-gcc
- os: linux
- env: DISTRO=debian:stable VARIANT=cross-compile.aarch64 TREE="out"
+ env: DISTRO=debian:stable VARIANT=cross-compile.aarch64 TREE=out
compiler: aarch64-linux-gnu-gcc
# musl (native)
@@ -28,7 +30,7 @@
# build with minimal dependencies
- os: linux
- env: DISTRO=debian:stable VARIANT=minimal TREE="out"
+ env: DISTRO=debian:stable VARIANT=minimal TREE=out
compiler: clang
# native non-intel
@@ -48,7 +50,7 @@
compiler: clang
- os: linux
- env: DISTRO=centos:6 TREE="out"
+ env: DISTRO=centos:6 TREE=out
compiler: gcc
- os: linux
@@ -76,7 +78,7 @@
compiler: clang
- os: linux
- env: DISTRO=ubuntu:latest TREE="out"
+ env: DISTRO=ubuntu:latest TREE=out
compiler: gcc
- os: linux
@@ -90,7 +92,7 @@
before_install:
- DIR="/usr/src/ltp"
- printf "FROM $DISTRO\nRUN mkdir -p $DIR\nWORKDIR $DIR\nCOPY . $DIR\n" > Dockerfile
- - echo "cat Dockerfile"; cat Dockerfile
+ - cat Dockerfile
- docker build -t ltp .
script:
diff --git a/travis/alpine.sh b/travis/alpine.sh
index 95bceb2..60bc1f4 100755
--- a/travis/alpine.sh
+++ b/travis/alpine.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2019 Petr Vorel <petr.vorel@gmail.com>
-set -e
+# Copyright (c) 2019-2020 Petr Vorel <petr.vorel@gmail.com>
+set -ex
apk update
@@ -24,7 +24,6 @@
openssl-dev \
pkgconfig
-echo "=== /etc/os-release ==="
cat /etc/os-release
echo "WARNING: remove unsupported tests (until they're fixed)"
diff --git a/travis/debian.cross-compile.aarch64.sh b/travis/debian.cross-compile.aarch64.sh
index 4b07f18..4334a10 100755
--- a/travis/debian.cross-compile.aarch64.sh
+++ b/travis/debian.cross-compile.aarch64.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2018 Petr Vorel <pvorel@suse.cz>
-set -e
+# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
+set -ex
apt install -y --no-install-recommends \
gcc-aarch64-linux-gnu \
diff --git a/travis/debian.cross-compile.ppc64le.sh b/travis/debian.cross-compile.ppc64le.sh
index d8431bd..5d6b0c7 100755
--- a/travis/debian.cross-compile.ppc64le.sh
+++ b/travis/debian.cross-compile.ppc64le.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2018 Petr Vorel <pvorel@suse.cz>
-set -e
+# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
+set -ex
apt install -y --no-install-recommends \
gcc-powerpc64le-linux-gnu \
diff --git a/travis/debian.i386.sh b/travis/debian.i386.sh
index 51a77e1..1c88a27 100755
--- a/travis/debian.i386.sh
+++ b/travis/debian.i386.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2018 Petr Vorel <pvorel@suse.cz>
-set -e
+# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
+set -ex
dpkg --add-architecture i386
apt update
diff --git a/travis/debian.minimal.sh b/travis/debian.minimal.sh
index 822de63..3f19419 100755
--- a/travis/debian.minimal.sh
+++ b/travis/debian.minimal.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2018 Petr Vorel <pvorel@suse.cz>
-set -e
+# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
+set -ex
apt remove -y \
libacl1-dev \
diff --git a/travis/debian.sh b/travis/debian.sh
index e1be4bb..7d0e48c 100755
--- a/travis/debian.sh
+++ b/travis/debian.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2018-2019 Petr Vorel <pvorel@suse.cz>
-set -e
+# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
+set -ex
# workaround for missing oldstable-updates repository
# W: Failed to fetch http://deb.debian.org/debian/dists/oldstable-updates/main/binary-amd64/Packages
diff --git a/travis/fedora.sh b/travis/fedora.sh
index a463333..eec8c3c 100755
--- a/travis/fedora.sh
+++ b/travis/fedora.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2018 Petr Vorel <pvorel@suse.cz>
-set -e
+# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
+set -ex
yum -y install \
autoconf \
diff --git a/travis/tumbleweed.sh b/travis/tumbleweed.sh
index c572571..330885b 100755
--- a/travis/tumbleweed.sh
+++ b/travis/tumbleweed.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2018 Petr Vorel <pvorel@suse.cz>
-set -e
+# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
+set -ex
zypper --non-interactive install --no-recommends \
autoconf \
