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

More fixes for appveyor scripts.

Browse Source
This commit is contained in:
Tomas Groth 2017-05-03 22:16:52 +02:00
parent a57a12441b
commit b98468e4dd
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/appveyor-webhook.py
View File

@ -37,6 +37,7 @@ from subprocess import Popen, PIPE
appveyor_build_url = 'https://ci.appveyor.com/project/OpenLP/{project}/build' appveyor_build_url = 'https://ci.appveyor.com/project/OpenLP/{project}/build'
appveyor_api_url = 'https://ci.appveyor.com/api/projects/OpenLP/{project}' appveyor_api_url = 'https://ci.appveyor.com/api/projects/OpenLP/{project}'
appveyor_log_url = 'https://ci.appveyor.com/api/buildjobs/{buildid}/log'
webhook_element = \ webhook_element = \
{ {
@ -84,7 +85,7 @@ def get_version():
return version_string, version return version_string, version
def get_yml(branch, build_docs): def get_yml(branch, build_type):
""" """
Returns the content of appveyor.yml and inserts the branch to be build Returns the content of appveyor.yml and inserts the branch to be build
""" """
@ -92,7 +93,7 @@ def get_yml(branch, build_docs):
yml_text = f.read() yml_text = f.read()
f.close() f.close()
yml_text = yml_text.replace('BRANCHNAME', branch) yml_text = yml_text.replace('BRANCHNAME', branch)
if build_docs: if build_type in ['openlp', 'trunk']:
yml_text = yml_text.replace('BUILD_DOCS', '$TRUE') yml_text = yml_text.replace('BUILD_DOCS', '$TRUE')
else: else:
yml_text = yml_text.replace('BUILD_DOCS', '$FALSE') yml_text = yml_text.replace('BUILD_DOCS', '$FALSE')
@ -115,28 +116,28 @@ def hook(webhook_url, yml):
print(responce.read().decode('utf-8')) print(responce.read().decode('utf-8'))
def get_appveyor_build_url(branch): def get_appveyor_build_url(build_type):
""" """
Get the url of the build. Get the url of the build.
""" """
if 'openlp-core/openlp/trunk' in branch: responce = urllib.request.urlopen(appveyor_api_url.format(project=build_type))
project = 'trunk'
else:
project = 'dev'
responce = urllib.request.urlopen(appveyor_api_url.format(project=project))
json_str = responce.read().decode('utf-8') json_str = responce.read().decode('utf-8')
build_json = json.loads(json_str) build_json = json.loads(json_str)
build_url = '%s/%s' % (appveyor_build_url.format(project=project), build_json['build']['version']) build_url = '%s/%s' % (appveyor_build_url.format(project=build_type), build_json['build']['version'])
print('Check this URL for build status: %s' % build_url.format(project=project)) print(build_url.format(project=build_type))
print(appveyor_log_url.format(buildid=build_json['build']['jobs'][0]['jobId']))
if len(sys.argv) != 4: if len(sys.argv) != 4:
print('Usage: %s <webhook-url> <branch> <build-docs>' % sys.argv[0]) print('Invalid number of arguments\nUsage: %s <webhook-url> <branch> <dev|trunk|openlp>' % sys.argv[0])
else: else:
webhook_url = sys.argv[1] webhook_url = sys.argv[1]
branch = sys.argv[2] branch = sys.argv[2]
build_docs = sys.argv[3].upper() == 'TRUE' build_type = sys.argv[3]
hook(webhook_url, get_yml(branch, build_docs)) if build_type not in ['dev', 'trunk', 'openlp']:
print('Invalid build type\nUsage: %s <webhook-url> <branch> <dev|trunk|openlp>' % sys.argv[0])
exit()
hook(webhook_url, get_yml(branch, build_type))
# Wait 5 seconds to make sure the hook has been triggered # Wait 5 seconds to make sure the hook has been triggered
time.sleep(5) time.sleep(5)
get_appveyor_build_url(branch) get_appveyor_build_url(build_type)

2
scripts/appveyor.yml
View File

@ -36,7 +36,7 @@ build: off
test_script: test_script:
- cd openlp-branch - cd openlp-branch
# Run the tests # Run the tests
#- "%PYTHON%\\python.exe -m nose -v tests" - "%PYTHON%\\python.exe -m nose -v tests"
# Go back to the user root folder # Go back to the user root folder
- cd.. - cd..