From 6239dc2cb99d9c6a8c0e69a68928307ca500c780 Mon Sep 17 00:00:00 2001
From: David Byers <david.byers@liu.se>
Date: Mon, 8 Feb 2021 12:52:11 +0100
Subject: [PATCH] More CI/CD. #force-build:thunderbird

---
 .gitlab-ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f0fc47..a3b8bb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ build:firefox:beta:
         - shared/**
         - firefox/**
       when: always
-    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "beta"'
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox)/ && $CI_COMMIT_BRANCH == "beta"'
       when: always
     - when: never
 
@@ -74,7 +74,7 @@ build:firefox:master:
         - shared/**
         - firefox/**
       when: always
-    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox)/ && $CI_COMMIT_BRANCH == "master"'
       when: always
     - when: never
 
@@ -96,7 +96,7 @@ build:thunderbird:beta:
         - shared/**
         - thunderbird/**
       when: always
-    - if: '$CI_COMMIT_MESSAGE =~ /#force-build/ && $CI_COMMIT_BRANCH == "beta"'
+    - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox)/ && $CI_COMMIT_BRANCH == "beta"'
       when: always
     - when: never
 
@@ -120,6 +120,9 @@ pages:
       job: build:firefox:beta
       ref: $CI_COMMIT_REF_NAME
       artifacts: true
+  dependencies:
+    - build:firefox:beta
+    - build:thunderbird:beta
   artifacts:
     paths:
       - public/
-- 
GitLab