From 2ae1a279c17c71dd73eef4a086754eb67ce1546c Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Mon, 16 Sep 2019 22:20:23 -0700
Subject: [PATCH 1/2] Added GitLab CI configuration

---
 .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..bfbd9f5d2
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,35 @@
+stages:
+  - test
+
+test-debian:
+  stage: test
+  image: registry.gitlab.com/openlp/runner:debian
+  before_script:
+    - sh scripts/generate_resources.sh
+  script:
+    - xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore
+
+test-ubuntu:
+  stage: test
+  image: registry.gitlab.com/openlp/runner:ubuntu
+  before_script:
+    - sh scripts/generate_resources.sh
+  script:
+    - xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore
+
+test-fedora:
+  stage: test
+  image: registry.gitlab.com/openlp/runner:fedora
+  before_script:
+    - sh scripts/generate_resources.sh
+  script:
+    - xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore
+
+test-macos:
+  stage: test
+  tags:
+    - macos
+  before_script:
+    - sh scripts/generate_resources.sh
+  script:
+    - python3 -m pytest -v --color=no --disable-warnings --ignore=tests/utils

From 3c9c5318846d1294bf0a3ada3bb646790ca4ab29 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Mon, 16 Sep 2019 23:41:16 -0700
Subject: [PATCH 2/2] Restrict macOS to master on the main project

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfbd9f5d2..f2acf7432 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,8 @@ test-fedora:
     - xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore
 
 test-macos:
+  only:
+    - master@openlp/openlp
   stage: test
   tags:
     - macos