Merge pull request #1952 from ktsaou/master

[netdata.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f1ecba4dd37e5293f1ab992d897e1cfdf19ae2d0..b7e04bfba79f65ee00d33bcc0c544767941a6c6b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,14 +28,12 @@ before_install:
 # Run
 before_script:
  - gpg --import packaging/gpg.keys
- # Run the commit hooks in case the developer didn't (Does not work for osx)
- - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | ./packaging/check-files -; fi
+ # Run the commit hooks in case the developer didn't
+ - git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | ./packaging/check-files -
 script:
    # make release packages
  - fakeroot ./packaging/git-build
-   # default build
- - ./autogen.sh && ./configure && make -j4
-   # test installer
+   # test build and installer
  - fakeroot ./netdata-installer.sh --install $HOME --dont-wait --dont-start-it
 #
 # Deploy as required
@@ -51,7 +49,6 @@ deploy:
     file_glob: true
     file: "netdata*.tar.*"
     on:
-      condition: $CC = gcc
-      condition: $TRAVIS_OS_NAME = linux
+      condition: $CC = gcc && $TRAVIS_OS_NAME
       repo: firehol/netdata
       tags: true