From e53f7d42b8be126cb54c9be5e5c2da52ff5e8683 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Tue, 3 May 2022 14:24:28 -0700
Subject: [PATCH] Move to multi-pipeline approach

---
 .woodpecker/.deploy.yml                  | 35 ++++++++++++++
 .woodpecker/.lint.yml                    | 16 +++++++
 .woodpecker.yml => .woodpecker/.test.yml | 59 +-----------------------
 3 files changed, 53 insertions(+), 57 deletions(-)
 create mode 100644 .woodpecker/.deploy.yml
 create mode 100644 .woodpecker/.lint.yml
 rename .woodpecker.yml => .woodpecker/.test.yml (56%)

diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml
new file mode 100644
index 000000000..e19bca391
--- /dev/null
+++ b/.woodpecker/.deploy.yml
@@ -0,0 +1,35 @@
+pipeline:
+  upload-pypi:
+    group: deploy
+    image: openlp/debian
+    pull: true
+    commands:
+      - python3 setup.py sdist bdist_wheel
+      - twine upload dist/*
+    when:
+      repo: openlp/openlp
+      event: tag
+      branch: master
+
+  # pages:
+  #   group: deploy
+  #   image: openlp/debian
+  #   commands:
+  #     - fixpaths linux.coverage
+  #     - fixpaths macos.coverage
+  #     - python3-coverage combine linux.coverage macos.coverage
+  #     - python3-coverage html
+  #     - mv htmlcov public
+  #     - python3-coverage report
+  #   artifacts:
+  #     paths:
+  #       - public
+  #   expire_in: 30 days
+  #   depends_on:
+  #     - test-debian
+  #     - test-macos
+  #   only:
+  #     - master@openlp/openlp
+
+depends_on:
+  - test
diff --git a/.woodpecker/.lint.yml b/.woodpecker/.lint.yml
new file mode 100644
index 000000000..96766a536
--- /dev/null
+++ b/.woodpecker/.lint.yml
@@ -0,0 +1,16 @@
+pipeline:
+  lint-python:
+    group: lint
+    image: openlp/debian
+    pull: true
+    commands:
+      - sh scripts/generate_resources.sh
+      - flake8
+
+  lint-javascript:
+    group: lint
+    image: openlp/angular
+    pull: true
+    commands:
+      - yarn install
+      - yarn lint
diff --git a/.woodpecker.yml b/.woodpecker/.test.yml
similarity index 56%
rename from .woodpecker.yml
rename to .woodpecker/.test.yml
index 0610ba1a3..d3b126c07 100644
--- a/.woodpecker.yml
+++ b/.woodpecker/.test.yml
@@ -1,20 +1,4 @@
 pipeline:
-  lint-python:
-    group: test
-    image: openlp/debian
-    pull: true
-    commands:
-      - sh scripts/generate_resources.sh
-      - flake8
-
-  lint-javascript:
-    group: test
-    image: openlp/angular
-    pull: true
-    commands:
-      - yarn install
-      - yarn lint
-
   test-debian:
     group: test
     image: openlp/debian
@@ -26,8 +10,6 @@ pipeline:
     # artifacts:
     #   paths:
     #     - linux.coverage
-    depends_on:
-      - lint-python
 
   test-ubuntu:
     group: test
@@ -36,8 +18,6 @@ pipeline:
     commands:
       - sh scripts/generate_resources.sh
       - xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings
-    depends_on:
-      - lint-python
 
   test-fedora:
     group: test
@@ -46,8 +26,6 @@ pipeline:
     commands:
       - sh scripts/generate_resources.sh
       - xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings
-    depends_on:
-      - lint-python
 
   test-arch:
     group: test
@@ -56,8 +34,6 @@ pipeline:
     commands:
       - sh scripts/generate_resources.sh
       - xvfb-run -s '-screen 0 1024x768x24' pytest --color=no --disable-warnings
-    depends_on:
-      - lint-python
 
   # test-macos:
   #   group: test
@@ -82,37 +58,6 @@ pipeline:
     commands:
       - yarn install
       - yarn test --browsers ChromiumHeadlessCI
-    depends_on:
-      - lint-javascript
 
-  upload-pypi:
-    group: deploy
-    image: openlp/debian
-    pull: true
-    commands:
-      - python3 setup.py sdist bdist_wheel
-      - twine upload dist/*
-    when:
-      repo: openlp/openlp
-      event: tag
-      branch: master
-
-  # pages:
-  #   group: deploy
-  #   image: openlp/debian
-  #   commands:
-  #     - fixpaths linux.coverage
-  #     - fixpaths macos.coverage
-  #     - python3-coverage combine linux.coverage macos.coverage
-  #     - python3-coverage html
-  #     - mv htmlcov public
-  #     - python3-coverage report
-  #   artifacts:
-  #     paths:
-  #       - public
-  #   expire_in: 30 days
-  #   depends_on:
-  #     - test-debian
-  #     - test-macos
-  #   only:
-  #     - master@openlp/openlp
+depends_on:
+  - lint