summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-03-31 11:50:33 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-04-09 07:40:28 -0400
commit4bb008393bc7cc851b86bd0e4460612f8d415a76 (patch)
tree4ac5d6732d1bbe8f65a0cc8852738573104b6005
parente58d5eeb90fb0c35ff08d8d9f752eab74fc9889e (diff)
downloadhaskell-4bb008393bc7cc851b86bd0e4460612f8d415a76.tar.gz
ci: Fix nightly head.hackage pipelines
This also needs a corresponding commit to head.hackage, I also made the job explicitly depend on the fedora33 job so that it isn't blocked by a failing windows job, which causes docs-tarball to fail.
-rw-r--r--.gitlab-ci.yml16
1 files changed, 15 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1ec3706dc..0e6dc2d019 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -528,11 +528,21 @@ test-bootstrap:
.hackage:
stage: testing
- needs: [doc-tarball]
+ needs:
+ - job: x86_64-linux-fedora33-perf
+ optional: true
+ artifacts: false
+ - job: nightly-x86_64-linux-fedora33-perf
+ optional: true
+ artifacts: false
+ - job: release-x86_64-linux-fedora33-perf
+ optional: true
+ artifacts: false
variables:
UPSTREAM_PROJECT_PATH: "$CI_PROJECT_PATH"
UPSTREAM_PROJECT_ID: "$CI_PROJECT_ID"
UPSTREAM_PIPELINE_ID: "$CI_PIPELINE_ID"
+ RELEASE_JOB: "$RELEASE_JOB"
trigger:
project: "ghc/head.hackage"
branch: "master"
@@ -556,6 +566,8 @@ hackage-label-lint:
nightly-hackage-lint:
rules:
- if: $NIGHTLY
+ variables:
+ NIGHTLY: "$NIGHTLY"
extends: .hackage
variables:
EXTRA_HC_OPTS: "-dcore-lint"
@@ -563,6 +575,8 @@ nightly-hackage-lint:
nightly-hackage-perf:
rules:
- if: $NIGHTLY
+ variables:
+ NIGHTLY: "$NIGHTLY"
extends: .hackage
variables:
# Generate logs for nightly builds which include timing information.