From b70cb0d0a21394d5d6b00b51f064115c2724cea8 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Mon, 19 Feb 2018 15:51:31 +0000
Subject: New upstream release

---
 .travis.yml | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index f9bd5eb9..6581fbd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ cache:
   ccache: true
 
 git:
-  depth: 2
+  depth: 1
 
 dist: trusty
 group: unstable
@@ -39,6 +39,9 @@ branches:
   - master
   - release-test
 
+services:
+  - docker
+
 env:
   global:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
@@ -49,26 +52,10 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq e2fslibs-dev gcc libacl1-dev libblkid-dev liblzo2-dev make pkg-config udev zlib1g-dev acl attr reiserfsprogs
   - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
-  - "mkdir tmp-reiser;
-     cd tmp-reiser;
-     wget https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.27/reiserfsprogs-3.6.27.tar.xz;
-     tar xf reiserfsprogs-3.6.27.tar.xz;
-     cd reiserfsprogs-3.6.27;
-     ./configure --prefix=/usr;
-     make all;
-     sudo make install;
-     cd ../..
-    "
-  - "mkdir tmp-zstd;
-     cd tmp-zstd;
-     wget https://github.com/facebook/zstd/archive/v1.3.1.tar.gz;
-     tar xf v1.3.1.tar.gz;
-     cd zstd-1.3.1;
-     make;
-     sudo make install PREFIX=/usr;
-     cd ../..
-    "
-  - "./autogen.sh && ./configure --disable-documentation && make"
+  - docker pull kdave/ci-musl-x86_64
+  - travis/build-dep-reiserfs
+  - travis/build-dep-zstd
+  - travis/build-default --disable-documentation
 
 addons:
   coverity_scan:
@@ -81,9 +68,13 @@ addons:
     branch_pattern: coverity_scan
 
 script:
+  # quick build tests
+  - "if travis/should-run-test; then docker run -it kdave/ci-musl-x86_64 ./test-build $TRAVIS_BRANCH --disable-documentation --disable-backtrace; fi"
+  # real tests
   - "if travis/should-run-test; then make TEST_LOG=dump test-cli; fi"
   - "if travis/should-run-test; then make TEST_LOG=dump test-mkfs; fi"
   - "if travis/should-run-test; then make TEST_LOG=dump test-check; fi"
   - "if travis/should-run-test; then make TEST_LOG=dump TEST_ENABLE_OVERRIDE=true TEST_ARGS_CHECK=--mode=lowmem test-check; fi"
   - "if travis/should-run-test; then make TEST_LOG=dump test-misc; fi"
+  # long running tests
   - "if [ $TRAVIS_BRANCH = release-test ]; then make TEST_LOG=dump test-convert; fi"
-- 
cgit v1.2.3