From 7ec4a3c0f7378f6436dc8366128d3aa344a87bed Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Thu, 22 Feb 2018 19:35:28 +0100
Subject: [PATCH] Fix osx build
---
ci/travis/before_install.sh | 3 +--
ci/travis/build.sh | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh
index 7379ff32..5b4abc35 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 3a25c7e2..5c053a33 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" ]
--
GitLab