Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
sakia
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
clients
python
sakia
Commits
7ec4a3c0
Commit
7ec4a3c0
authored
7 years ago
by
inso
Browse files
Options
Downloads
Patches
Plain Diff
Fix osx build
parent
c949ffe6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ci/travis/before_install.sh
+1
-2
1 addition, 2 deletions
ci/travis/before_install.sh
ci/travis/build.sh
+1
-2
1 addition, 2 deletions
ci/travis/build.sh
with
2 additions
and
4 deletions
ci/travis/before_install.sh
+
1
−
2
View file @
7ec4a3c0
...
@@ -11,14 +11,12 @@ fi
...
@@ -11,14 +11,12 @@ fi
if
[
$TRAVIS_OS_NAME
==
"osx"
]
if
[
$TRAVIS_OS_NAME
==
"osx"
]
then
then
brew tap homebrew/versions
brew update
brew update
brew
install
libsodium
brew
install
libsodium
## Ensure your brew QT version is up to date. (brew install qt -> qt 4.8)
## Ensure your brew QT version is up to date. (brew install qt -> qt 4.8)
brew
install
qt5
brew
install
qt5
brew list qt5
brew list qt5
brew
install
pyenv-virtualenv
brew
install
pyenv-virtualenv
pyenv update
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
then
then
sudo
apt-get update
sudo
apt-get update
...
@@ -48,6 +46,7 @@ fi
...
@@ -48,6 +46,7 @@ fi
eval
"
$(
pyenv init -
)
"
eval
"
$(
pyenv init -
)
"
pyenv update
pyenv
install
--list
pyenv
install
--list
if
[
$TRAVIS_OS_NAME
==
"osx"
]
if
[
$TRAVIS_OS_NAME
==
"osx"
]
then
then
...
...
This diff is collapsed.
Click to expand it.
ci/travis/build.sh
+
1
−
2
View file @
7ec4a3c0
...
@@ -11,7 +11,7 @@ pip install --upgrade pip
...
@@ -11,7 +11,7 @@ pip install --upgrade pip
pyenv rehash
pyenv rehash
pip
install
coveralls
pip
install
coveralls
pip
install
pytest-cov
pip
install
pytest-cov
pip
install
pyinstaller
==
3.
2
pip
install
pyinstaller
==
3.
3.1
pip
install
-r
requirements.txt
pip
install
-r
requirements.txt
if
[
$TRAVIS_OS_NAME
==
"linux"
]
if
[
$TRAVIS_OS_NAME
==
"linux"
]
then
then
...
@@ -34,7 +34,6 @@ if [ $TRAVIS_OS_NAME == "osx" ]
...
@@ -34,7 +34,6 @@ if [ $TRAVIS_OS_NAME == "osx" ]
then
then
pyinstaller sakia.spec
pyinstaller sakia.spec
cp
-rv
dist/sakia/
*
dist/sakia.app/Contents/MacOS
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/
cp
-v
res/osx/Info.plist dist/sakia.app/Contents/
rm
-rfv
dist/sakia
rm
-rfv
dist/sakia
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment