diff options
| author | Bryan Richter <bryan@haskell.foundation> | 2022-11-30 16:13:51 +0200 |
|---|---|---|
| committer | Bryan Richter <bryan@haskell.foundation> | 2022-11-30 16:51:13 +0200 |
| commit | 913396ad00862e89b771796108850c2b4e75f54f (patch) | |
| tree | 5db0e79bffbb1f5abb74548745b1be8f7d9b692a | |
| parent | 4908c4b0a05d6d70649f686f9fe5c25c167f1ba0 (diff) | |
| download | haskell-wip/remove-armv7-builds.tar.gz | |
CI: Fix CI lintwip/remove-armv7-builds
Failure was introduced by conflicting changes to gen_ci.hs that did
*not* trigger git conflicts.
| -rw-r--r-- | .gitlab/jobs.yaml | 4 |
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" } ], |