btrfs-progs: convert/ext2: Remove check for ext2_ext_attr_entry->e_value_block

[platform/upstream/btrfs-progs.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index e37bbc5..a9953bb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,9 @@ compiler:
 
 cache:
   ccache: true
+  directories:
+    - tmp-cached-reiser
+    - tmp-cached-zstd
 
 git:
   depth: 1
@@ -50,28 +53,11 @@ env:
 
 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
+  - sudo apt-get install -qq e2fslibs-dev gcc libacl1-dev libblkid-dev liblzo2-dev make pkg-config udev zlib1g-dev acl attr reiserfsprogs python3-setuptools
   - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
   - docker pull kdave/ci-musl-x86_64
-  - "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.3.tar.gz;
-     tar xf v1.3.3.tar.gz;
-     cd zstd-1.3.3;
-     make;
-     sudo make install PREFIX=/usr;
-     cd ../..
-    "
+  - travis/build-dep-reiserfs
+  - travis/build-dep-zstd
   - travis/build-default --disable-documentation
 
 addons:
@@ -86,7 +72,7 @@ addons:
 
 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"
+  - "if travis/should-run-test; then docker run -it --env CC=$CC 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"