From 941d10dd09200d7c8974f57eb07db234749943b7 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 20 Sep 2019 18:22:22 +0200 Subject: [PATCH] Fix travis --- .travis.yml | 3 --- install | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d263aa..e950bde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,6 @@ script: - lsb_release -a - sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > /home/travis/.gitconfig' - sudo echo "Travis Banch = $TRAVIS_BRANCH" - - sed -i 's/# "nose"/"nose"/g' setup.py - - sed -i 's/# "coverage"/"coverage"/g' setup.py - - sed -i 's/# "Sphinx >= 1.0"/"Sphinx >= 1.0"/g' setup.py - sudo time bash install --travis -b "$TRAVIS_BRANCH" - sudo time bash tests/travis.sh diff --git a/install b/install index e425ff1..d559a9a 100755 --- a/install +++ b/install @@ -826,13 +826,13 @@ else _run wo_install_dep "Installing wo dependencies" _run wo_timesync #if [ "$ufw" = "y" ]; then - # _run wo_ufw_setup "Configuring UFW" + # _run wo_ufw_setup "Configuring UFW" #fi # skip steps if travis - _run wo_download "Downloading WordOps" if [ -z "$wo_travis" ]; then + _run wo_download "Downloading WordOps" _run wo_dist_upgrade - wo_git_config + wo_git_config _run wo_install "Installing WordOps" else _run wo_install_travis "Installing WordOps"