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
4ca6ff53
Commit
4ca6ff53
authored
9 years ago
by
inso
Browse files
Options
Downloads
Patches
Plain Diff
Remove one line conditionals
parent
e37f0b67
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ci/travis/before_deploy.sh
+7
-2
7 additions, 2 deletions
ci/travis/before_deploy.sh
ci/travis/before_install.sh
+14
-4
14 additions, 4 deletions
ci/travis/before_install.sh
ci/travis/build.sh
+7
-2
7 additions, 2 deletions
ci/travis/build.sh
with
28 additions
and
8 deletions
ci/travis/before_deploy.sh
+
7
−
2
View file @
4ca6ff53
#!/usr/bin/env bash
#!/usr/bin/env bash
[
$TRAVIS_OS_NAME
==
"osx"
]
&&
zip
-r
sakia-
${
TRAVIS_OS_NAME
}
.zip build/
*
.dmg
if
[
$TRAVIS_OS_NAME
==
"osx"
]
[
$TRAVIS_OS_NAME
==
"linux"
]
&&
zip
-r
sakia-
${
TRAVIS_OS_NAME
}
.zip build/exe
*
then
zip
-r
sakia-
${
TRAVIS_OS_NAME
}
.zip build/
*
.dmg
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
then
zip
-r
sakia-
${
TRAVIS_OS_NAME
}
.zip build/exe
*
fi
This diff is collapsed.
Click to expand it.
ci/travis/before_install.sh
+
14
−
4
View file @
4ca6ff53
...
@@ -28,8 +28,13 @@ pyenv activate sakia-env
...
@@ -28,8 +28,13 @@ pyenv activate sakia-env
if
[
$?
-ne
0
]
if
[
$?
-ne
0
]
then
then
echo
"Sakia env cache cleared, rebuilding it..."
echo
"Sakia env cache cleared, rebuilding it..."
[
$TRAVIS_OS_NAME
==
"osx"
]
&&
env
PYTHON_CONFIGURE_OPTS
=
"--enable-framework"
pyenv
install
$PYENV_PYTHON_VERSION
if
[
$TRAVIS_OS_NAME
==
"osx"
]
[
$TRAVIS_OS_NAME
==
"linux"
]
&&
PYTHON_CONFIGURE_OPTS
=
"--enable-shared"
pyenv
install
$PYENV_PYTHON_VERSION
then
env
PYTHON_CONFIGURE_OPTS
=
"--enable-framework"
pyenv
install
$PYENV_PYTHON_VERSION
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
then
PYTHON_CONFIGURE_OPTS
=
"--enable-shared"
pyenv
install
$PYENV_PYTHON_VERSION
fi
pyenv shell
$PYENV_PYTHON_VERSION
pyenv shell
$PYENV_PYTHON_VERSION
pyenv virtualenv sakia-env
pyenv virtualenv sakia-env
...
@@ -50,8 +55,13 @@ then
...
@@ -50,8 +55,13 @@ then
tar
xzf PyQt-gpl-5.5.1.tar.gz
tar
xzf PyQt-gpl-5.5.1.tar.gz
cd
PyQt-gpl-5.5.1/
cd
PyQt-gpl-5.5.1/
pyenv activate sakia-env
pyenv activate sakia-env
[
$TRAVIS_OS_NAME
==
"osx"
]
&&
python configure.py
--confirm-license
if
[
$TRAVIS_OS_NAME
==
"osx"
]
[
$TRAVIS_OS_NAME
==
"linux"
]
&&
python configure.py
--qmake
"/usr/lib/x86_64-linux-gnu/qt5/bin/qmake"
--confirm-license
then
python configure.py
--confirm-license
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
then
python configure.py
--qmake
"/usr/lib/x86_64-linux-gnu/qt5/bin/qmake"
--confirm-license
fi
make
-j
2
&&
make
install
make
-j
2
&&
make
install
pyenv rehash
pyenv rehash
...
...
This diff is collapsed.
Click to expand it.
ci/travis/build.sh
+
7
−
2
View file @
4ca6ff53
...
@@ -10,6 +10,11 @@ pip install -r requirements.txt
...
@@ -10,6 +10,11 @@ pip install -r requirements.txt
python gen_resources.py
python gen_resources.py
python gen_translations.py
python gen_translations.py
[
$TRAVIS_OS_NAME
==
"osx"
]
&&
python setup.py bdist_dmg
if
[
$TRAVIS_OS_NAME
==
"osx"
]
[
$TRAVIS_OS_NAME
==
"linux"
]
&&
python setup.py build
then
python setup.py bdist_dmg
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
then
python setup.py build
fi
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