diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-02 19:16:14 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-23 20:43:36 -0400 |
| commit | df895b3f972e0062a81c8c136fa9fdd79badea5c (patch) | |
| tree | 4519989fa33a3221ed3d45476e5f7d2242ea4c44 /.gitlab-ci.yml | |
| parent | 05c5c0549bee022be84344cef46f0eded5564c3b (diff) | |
| download | haskell-df895b3f972e0062a81c8c136fa9fdd79badea5c.tar.gz | |
gitlab-ci: Rework handling of head.hackage job trigger
GitLab 12.3 now has reasonable support [1] for cross-project job
dependencies, allowing us to drop the awful hack of a shell script we
used previously.
[1] https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#mirroring-status-from-triggered-pipeline
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72cb116556..e60f8d1c3a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1339,14 +1339,14 @@ source-tarball: .hackage: stage: testing needs: [doc-tarball] - image: ghcci/x86_64-linux-deb9:0.2 - tags: - - x86_64-linux - dependencies: [] variables: - HEAD_HACKAGE_PROJECT_ID: "78" - script: - - bash .gitlab/start-head.hackage.sh + UPSTREAM_PROJECT_PATH: "$CI_PROJECT_PATH" + UPSTREAM_COMMIT_SHA: "$CI_COMMIT_SHA" + EXTRA_HC_OPTS: "-dcore-lint" + trigger: + project: "ghc/head.hackage" + branch: "master" + strategy: "depend" hackage: extends: .hackage @@ -1358,7 +1358,8 @@ hackage-label: - if: '$CI_MERGE_REQUEST_LABELS =~ /.*user-facing.*/' nightly-hackage: - <<: *nightly + rules: + - if: $NIGHTLY extends: .hackage ############################################################ |