raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

More improvements to appveyor integration.

Browse Source
This commit is contained in:
Tomas Groth 2018-07-16 22:01:47 +02:00
parent 6adf749e99
commit 378ad41747
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/appveyor-webhook.py
View File

@ -81,7 +81,7 @@ def get_version():
latest = output.decode('utf-8').split(':')[0] latest = output.decode('utf-8').split(':')[0]
version_string = latest == revision and tag or 'r%s' % latest version_string = latest == revision and tag or 'r%s' % latest
# Save decimal version in case we need to do a portable build. # Save decimal version in case we need to do a portable build.
version = latest == revision and tag or '%s.%s' % (tag, latest) version = latest == revision and tag or '%s-bzr%s' % (tag, latest)
return version_string, version return version_string, version
@ -93,7 +93,7 @@ def get_yml(branch, build_type):
yml_text = f.read() yml_text = f.read()
f.close() f.close()
version_string, version = get_version() version_string, version = get_version()
yml_text = yml_text.replace('TAG', version_string) yml_text = yml_text.replace('TAG', version)
if build_type in ['openlp', 'trunk']: if build_type in ['openlp', 'trunk']:
yml_text = yml_text.replace('BRANCHPATH', '~openlp-core/openlp/trunk') yml_text = yml_text.replace('BRANCHPATH', '~openlp-core/openlp/trunk')
yml_text = yml_text.replace('BUILD_DOCS', '$TRUE') yml_text = yml_text.replace('BUILD_DOCS', '$TRUE')

10
scripts/appveyor.yml
View File

@ -1,17 +1,17 @@
version: OpenLP-win-ci-b{build} version: OpenLP-win-ci-b{build}
clone_script: clone_script:
- curl -L https://bazaar.launchpad.net/~tomasgroth/openlp/pco-24/tarball -o pco.tar.gz - curl -L https://bazaar.launchpad.net/BRANCHPATH/tarball -o sourcecode.tar.gz
- 7z e pco.tar.gz - 7z e sourcecode.tar.gz
- 7z x pco.tar - 7z x sourcecode.tar
- mv ~tomasgroth/openlp/pco-24 openlp-branch - mv BRANCHPATH openlp-branch
environment: environment:
PYTHON: C:\\Python34 PYTHON: C:\\Python34
install: install:
# Install dependencies from pypi # Install dependencies from pypi
- "%PYTHON%\\python.exe -m pip install sqlalchemy alembic chardet beautifulsoup4 Mako nose mock pyodbc==4.0.8 psycopg2 pypiwin32 pyenchant websockets asyncio waitress six webob requests" - "%PYTHON%\\python.exe -m pip install sqlalchemy alembic chardet beautifulsoup4 Mako nose mock pyodbc==4.0.8 psycopg2 pypiwin32==219 pyenchant websockets asyncio waitress six webob requests"
# Install mysql dependency # Install mysql dependency
- "%PYTHON%\\python.exe -m pip install http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df" - "%PYTHON%\\python.exe -m pip install http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df"
# Download and install lxml and pyicu (originally from http://www.lfd.uci.edu/~gohlke/pythonlibs/) # Download and install lxml and pyicu (originally from http://www.lfd.uci.edu/~gohlke/pythonlibs/)