From 4ab160a2048d5113d1c54fb0a73f61a253c7b765 Mon Sep 17 00:00:00 2001
From: David Byers <david.byers@liu.se>
Date: Mon, 8 Feb 2021 16:43:51 +0100
Subject: [PATCH] Try to correct triggering of build jobs.
---
.gitlab-ci.yml | 8 ++++----
shared/_locales/en/messages.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3257a4e..8002c66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,8 +70,8 @@ build:firefox:beta:
rules:
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta"'
changes:
- - shared/**
- - firefox/**
+ - shared/**/*
+ - firefox/**/*
when: always
- if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox)/ && $CI_COMMIT_BRANCH == "beta"'
when: always
@@ -104,8 +104,8 @@ build:firefox:release:
rules:
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta"'
changes:
- - shared/**
- - thunderbird/**
+ - shared/**/*
+ - thunderbird/**/*
when: always
- if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|thunderbird)/ && $CI_COMMIT_BRANCH == "beta"'
when: always
diff --git a/shared/_locales/en/messages.json b/shared/_locales/en/messages.json
index 8b3a8f5..2758d12 100644
--- a/shared/_locales/en/messages.json
+++ b/shared/_locales/en/messages.json
@@ -6,6 +6,6 @@
"copyLinkMenuTitle": {
"message": "Copy original link",
- "description": "Title of the copy original link menu item."
+ "description": "Title of the 'copy original link' menu item."
}
}
--
GitLab