summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-07-31 13:42:51 -0400
committerBen Gamari <ben@smart-cactus.org>2019-07-31 13:53:58 -0400
commit5e04841c4641e2249066614065053166657e3eb4 (patch)
tree063e9829a49fa1d0fe53b87019fcd62a4444c207
parent787fab43e06456e6889a47764d7bd8c5d81ab5cb (diff)
downloadhaskell-5e04841c4641e2249066614065053166657e3eb4.tar.gz
gitlab-ci: Fix it after upgrade
It seems that the regular expression parser changed in GitLab 12.1 and now does now support forward slashes in the RE, even when escaped.
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb2ffcf3db..9cf17ea9ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,7 +127,7 @@ lint-submods-marge:
refs:
- merge_requests
variables:
- - $CI_MERGE_REQUEST_LABELS =~ /.*wip/marge_bot_batch_merge_job.*/
+ - "$CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/"
lint-submods-mr:
extends: .lint-submods
@@ -139,7 +139,7 @@ lint-submods-mr:
- merge_requests
except:
variables:
- - $CI_MERGE_REQUEST_LABELS =~ /.*wip/marge_bot_batch_merge_job.*/
+ - "$CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/"
lint-submods-branch:
extends: .lint-submods