summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2021-06-21 09:32:57 +0100
committerMatthew Pickering <matthewtpickering@gmail.com>2021-06-21 09:35:03 +0100
commit3e1354969ef23459d23f9266997f354afd40cdd1 (patch)
tree74b6dd6668e022caa4d7fb40be63beb79fa7337c
parenta0622459f1d9a7068e81b8a707ffc63e153444f8 (diff)
downloadhaskell-wip/head-hackage-jobs.tar.gz
CI: Don't set EXTRA_HC_OPTS in head.hackage jobwip/head-hackage-jobs
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 5d38902cbf..ba2b4b30a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1330,7 +1330,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"
@@ -1349,6 +1348,9 @@ nightly-hackage:
rules:
- if: $NIGHTLY
extends: .hackage
+ variables:
+ # Generate logs for nightly builds
+ EXTRA_HC_OPTS: "-dcore-lint -ddump-timings"
############################################################
# Nofib testing