From d2f1eb651b2844185fc4efc71c72e2d95072a23d Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 8 Oct 2019 02:36:14 +0200 Subject: [PATCH] Update travis testing --- .travis.yml | 4 +++- install | 14 +++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64c9c5f..9abb1fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_script: - sudo bash -c 'echo example.com > /etc/hostname' - unset LANG - sudo apt-get -qq purge mysql* graphviz* redis* - - sudo apt-get install -qq git python3-setuptools python3-dev python3-apt ccze tree + - sudo apt-get install -qq git python3-setuptools python3-dev python3-apt ccze tree python3-wheel python3-pip - sudo apt-get -qq autoremove --purge @@ -37,6 +37,8 @@ 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" + - sudo python3 setup.py sdist bdist_wheel + - sudo time bash install --travis -b "$TRAVIS_BRANCH" - sudo time bash tests/travis.sh - sudo wo update --travis \ No newline at end of file diff --git a/install b/install index 0eef3dc..1d647c9 100755 --- a/install +++ b/install @@ -462,6 +462,16 @@ wo_install() { } +# WordOps install +wo_travis_install() { + + python3 -m pip install pip --upgrade + python3 -m pip install dist/*.whl --upgrade + cp -rf /usr/local/lib/python3.*/dist-packages/etc/* /etc/ + cp -rf /usr/local/lib/python3.*/dist-packages/usr/* /usr/ + +} + wo_upgrade_nginx() { if [ -d /var/lib/wo-backup/nginx ]; then @@ -773,8 +783,10 @@ else if [ -z "$wo_travis" ]; then _run wo_dist_upgrade wo_git_config + _run wo_install "Installing WordOps" + else + _run wo_travis_install "Installing WordOps" fi - _run wo_install "Installing WordOps" if [ -x /usr/local/bin/ee ]; then _run wo_upgrade_nginx "Upgrading Nginx" _run wo_clean_ee "Cleaning previous EasyEngine install"