Skip to content

Commit 250aea4

Browse files
Set default GHC/Cabal version for CI jobs (#1661)
Prevents failures during 'hackage-sdist'
1 parent 7a445b0 commit 250aea4

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.ci/gitlab/publish.yml

-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ hackage-sdist:
22
extends: .common
33
stage: pack
44
interruptible: false
5-
variables:
6-
GHC_VERSION: 8.10.3
75
script:
86
- .ci/build_sdist.sh clash-prelude
97
- .ci/build_sdist.sh clash-lib
@@ -12,19 +10,13 @@ hackage-sdist:
1210
paths:
1311
- clash-*.tar.gz # clash-{prelude,lib,ghc}-$version{-docs,}.tar.gz
1412
expire_in: 1 week
15-
rules:
16-
- if: '$CI_COMMIT_TAG != null' # tags
17-
- if: $CI_PIPELINE_SOURCE == "schedule"
18-
- if: $CI_PIPELINE_SOURCE == "trigger"
1913

2014
.hackage:
2115
extends: .common
2216
interruptible: false
2317
stage: publish
2418
cache:
2519
key: hackage
26-
variables:
27-
GHC_VERSION: 8.10.3
2820
script:
2921
- .ci/publish_sdist.sh clash-prelude
3022
- .ci/publish_sdist.sh clash-lib

.gitlab-ci.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ include:
33
- '/.ci/gitlab/publish.yml'
44
# - '/.ci/gitlab/benchmark.yml'
55

6+
# Default GHC / Cabal version. Used for generating Haddock and releasing to
7+
# Hackage.
8+
variables:
9+
GHC_VERSION: 8.10.3
10+
CABAL_VERSION: 3.2.0.0
11+
612
stages:
713
- pre
814
- test
@@ -58,9 +64,6 @@ haddock:
5864
extends: .common
5965
needs: []
6066
stage: test
61-
variables:
62-
GHC_VERSION: 8.10.3
63-
CABAL_VERSION: 3.2.0.0
6467
artifacts:
6568
paths:
6669
- hadocs/*/*

0 commit comments

Comments
 (0)