diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-01-18 14:09:14 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-01-18 14:18:15 +0100 |
| commit | 1036f65a665e5018d5bb94fa30bcfdbd0cd17521 (patch) | |
| tree | a5b2d9703684c5470fb2839db3d3ed6b1914fe25 | |
| parent | b5bb2bdc4541f8512cc2eebd89ed4fd62ef242e6 (diff) | |
| download | NetworkManager-lr/zanata666.tar.gz | |
-checklr/zanata666
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | contrib/travis/zanata-update.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index eceae5eca4..37fb9eca07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,6 @@ before_install: script: | sh autogen.sh --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-ifupdown --enable-ifnet --enable-tests && - make -j4 && - ./contrib/travis/travis-check.sh && ./contrib/travis/zanata-update.sh addons: diff --git a/contrib/travis/zanata-update.sh b/contrib/travis/zanata-update.sh index 5babb0a4c7..e74401d6fa 100755 --- a/contrib/travis/zanata-update.sh +++ b/contrib/travis/zanata-update.sh @@ -1,5 +1,6 @@ #!/bin/bash +TRAVIS_BRANCH=master if echo "$TRAVIS_BRANCH" |egrep -q '^master$|^nm-[0-9]*-[0-9]*$'; then wget -O zanata-cli-4.0.0.tar.gz 'http://search.maven.org/remotecontent?filepath=org/zanata/zanata-cli/4.0.0/zanata-cli-4.0.0-dist.tar.gz' tar xzf zanata-cli-4.0.0.tar.gz |