Merge branch 'test-windows' into 'master'

Set up a GitLab runner on a Windows 7 VM, and configure the pipeline to use it.

See merge request openlp/openlp!43
This commit is contained in:
Tim Bentley 2019-10-17 11:03:39 +00:00
commit 362a775a55
2 changed files with 17 additions and 1 deletions

2
.gitignore vendored
View File

@ -16,10 +16,12 @@
.cache
.coverage
.directory
.eggs
.idea
.kdev4
.komodotools
.pytest_cache
.venv
.vscode
OpenLP.egg-info
\#*\#

View File

@ -63,11 +63,24 @@ test-macos:
only:
- master@openlp/openlp
test-windows:
stage: test
tags:
- windows
script:
- C:\Users\raoul\GitLab-Runner\venv\Scripts\pytest.exe --color=no --disable-warnings --cov openlp
- mv .coverage windows.coverage
artifacts:
paths:
- windows.coverage
only:
- master@openlp/openlp
pages:
stage: deploy
image: openlp/debian
script:
- python3-coverage combine linux.coverage macos.coverage
- python3-coverage combine linux.coverage macos.coverage windows.coverage
- fixpaths .coverage
- python3-coverage html
- mv htmlcov public
@ -79,5 +92,6 @@ pages:
dependencies:
- test-debian
- test-macos
- test-windows
only:
- master@openlp/openlp