From 3db05e102414e6b3f9401a7253f85a5c33c096e6 Mon Sep 17 00:00:00 2001
From: David Byers <david.byers@liu.se>
Date: Mon, 8 Feb 2021 13:02:42 +0100
Subject: [PATCH] More CI/CD. #force-build:thunderbird
---
.gitlab-ci.yml | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1bef60..6cc0c3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,16 +107,9 @@ collect:
stage: collect
script:
- echo "done"
- rules:
- - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta"'
- changes:
- - shared/**
- - thunderbird/**
- - firefox/**
- when: always
- - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox|thunderbird)/ && $CI_COMMIT_BRANCH == "beta"'
- when: always
- - when: never
+ only:
+ - master
+ - beta
pages:
@@ -129,7 +122,7 @@ pages:
- mv .public public
- ls -lr public
needs:
- - job: prepare
+ - job: collect
- project: $CI_PROJECT_PATH
job: build:thunderbird:beta
ref: $CI_COMMIT_REF_NAME
--
GitLab