Fix travis

This commit is contained in:
VirtuBox
2019-09-20 18:22:22 +02:00
parent c9eef0dc68
commit 941d10dd09
2 changed files with 3 additions and 6 deletions

View File

@@ -37,9 +37,6 @@ script:
- lsb_release -a - lsb_release -a
- sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > /home/travis/.gitconfig' - sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > /home/travis/.gitconfig'
- sudo echo "Travis Banch = $TRAVIS_BRANCH" - 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 install --travis -b "$TRAVIS_BRANCH"
- sudo time bash tests/travis.sh - sudo time bash tests/travis.sh

View File

@@ -826,13 +826,13 @@ else
_run wo_install_dep "Installing wo dependencies" _run wo_install_dep "Installing wo dependencies"
_run wo_timesync _run wo_timesync
#if [ "$ufw" = "y" ]; then #if [ "$ufw" = "y" ]; then
# _run wo_ufw_setup "Configuring UFW" # _run wo_ufw_setup "Configuring UFW"
#fi #fi
# skip steps if travis # skip steps if travis
_run wo_download "Downloading WordOps"
if [ -z "$wo_travis" ]; then if [ -z "$wo_travis" ]; then
_run wo_download "Downloading WordOps"
_run wo_dist_upgrade _run wo_dist_upgrade
wo_git_config wo_git_config
_run wo_install "Installing WordOps" _run wo_install "Installing WordOps"
else else
_run wo_install_travis "Installing WordOps" _run wo_install_travis "Installing WordOps"