From 5bb8edecf5b1c7f78b783bb9aea9d32a0f042f07 Mon Sep 17 00:00:00 2001
From: David Byers <david.byers@liu.se>
Date: Mon, 8 Feb 2021 11:55:26 +0100
Subject: [PATCH] More CI/CD.
---
.gitlab-ci.yml | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5862cc5..5330fa6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,23 +46,31 @@ prepare:
artifacts:
paths:
- safelinks-cleaner-firefox.xpi
- when: manual
deploy:firefox:beta:
extends: .deploy:firefox
variables:
CHANNEL: unlisted
- only:
- - beta
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta'
+ - changes:
+ - shared/**
+ - firefox/**
+ - when: always
+
deploy:firefox:master:
extends: .deploy:firefox
variables:
CHANNEL: listed
- only:
- - master
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master'
+ - changes:
+ - shared/**
+ - firefox/**
+ - when: always
deploy:thunderbird:
@@ -76,18 +84,17 @@ deploy:thunderbird:
artifacts:
paths:
- safelinks-cleaner-thunderbird.xpi
- when: manual
+ when: always
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta"'
+ - changes:
+ - shared/**
+ - thunderbird/**
+ - when: always
pages:
stage: deploy
- needs:
- - project: $CI_PROJECT_PATH
- ref: $CI_COMMIT_SHA
- job: deploy:thunderbird
- - project: $CI_PROJECT_PATH
- ref: $CI_COMMIT_SHA
- job: deploy:firefox
script:
- cp -r site .public
- sed -i -e "s/%BUILDDATE%/$(date +'%Y-%m-%d %H:%M')/g" .public/index.html
@@ -100,4 +107,4 @@ pages:
- public/
only:
- beta
- when: manual
+ when: always
--
GitLab