summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorBryan Richter <bryan@haskell.foundation>2022-11-30 16:13:51 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-12-01 12:37:56 -0500
commitd82992fd4b62a81607af1667e4ff755d58af291f (patch)
tree1822d1d595213b791e1bd8e80a7b5deaead6e53e /.gitlab
parentc5d1bf2962fc88f92c71b771ab16b3c8c096682a (diff)
downloadhaskell-d82992fd4b62a81607af1667e4ff755d58af291f.tar.gz
CI: Fix CI lint
Failure was introduced by conflicting changes to gen_ci.hs that did *not* trigger git conflicts.
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/jobs.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml
index bf6215c7a0..63ee38aca3 100644
--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml
@@ -1240,7 +1240,7 @@
],
"rules": [
{
- "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+ "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
"when": "on_success"
}
],
@@ -3720,7 +3720,7 @@
],
"rules": [
{
- "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+ "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
"when": "on_success"
}
],