diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh index 7379ff328751ea8dafc866431cdc8a576be676eb..5b4abc3581f91ed9687f4277d5a378b742d29a08 100755 --- a/ci/travis/before_install.sh +++ b/ci/travis/before_install.sh @@ -11,14 +11,12 @@ fi if [ $TRAVIS_OS_NAME == "osx" ] then - brew tap homebrew/versions brew update brew install libsodium ## Ensure your brew QT version is up to date. (brew install qt -> qt 4.8) brew install qt5 brew list qt5 brew install pyenv-virtualenv - pyenv update elif [ $TRAVIS_OS_NAME == "linux" ] then sudo apt-get update @@ -48,6 +46,7 @@ fi eval "$(pyenv init -)" +pyenv update pyenv install --list if [ $TRAVIS_OS_NAME == "osx" ] then diff --git a/ci/travis/build.sh b/ci/travis/build.sh index 3a25c7e2045bc9745f37b8ac9efa3d41c0371cdf..5c053a334205e466862b82655bcea591e82d2180 100755 --- a/ci/travis/build.sh +++ b/ci/travis/build.sh @@ -11,7 +11,7 @@ pip install --upgrade pip pyenv rehash pip install coveralls pip install pytest-cov -pip install pyinstaller==3.2 +pip install pyinstaller==3.3.1 pip install -r requirements.txt if [ $TRAVIS_OS_NAME == "linux" ] then @@ -34,7 +34,6 @@ if [ $TRAVIS_OS_NAME == "osx" ] then pyinstaller sakia.spec cp -rv dist/sakia/* dist/sakia.app/Contents/MacOS - cp -va dist/sakia/* dist/sakia.app/Contents/MacOS cp -v res/osx/Info.plist dist/sakia.app/Contents/ rm -rfv dist/sakia elif [ $TRAVIS_OS_NAME == "linux" ]