summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2021-06-21 09:32:57 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-06-22 02:33:00 -0400
commit65bad0de6fd1431f0670002d68974adce3e9fc4a (patch)
tree290f951d4720392035e8f2086c681427e29ebb44
parent5abf59976c7335df760e5d8609d9488489478173 (diff)
downloadhaskell-65bad0de6fd1431f0670002d68974adce3e9fc4a.tar.gz
CI: Don't set EXTRA_HC_OPTS in head.hackage job
Upstream environment variables take precedance over downstream variables. It is more consistent (and easier to modify) if the variables are all set in the head.hackage CI file rather than setting this here. [skip ci]
-rw-r--r--.gitlab-ci.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20a9bba692..b0a767eac2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1331,7 +1331,6 @@ source-tarball:
UPSTREAM_PROJECT_PATH: "$CI_PROJECT_PATH"
UPSTREAM_PROJECT_ID: "$CI_PROJECT_ID"
UPSTREAM_PIPELINE_ID: "$CI_PIPELINE_ID"
- EXTRA_HC_OPTS: "-dcore-lint"
trigger:
project: "ghc/head.hackage"
branch: "master"
@@ -1350,6 +1349,9 @@ nightly-hackage:
rules:
- if: $NIGHTLY
extends: .hackage
+ variables:
+ # Generate logs for nightly builds
+ EXTRA_HC_OPTS: "-dcore-lint -ddump-timings"
############################################################
# Nofib testing