aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2019-06-17 19:27:22 +0200
committerDaniel Gröber <dxld@darkboxed.org>2019-06-17 23:25:28 +0200
commit2e8e3d076647f8426d08cfacb283b43fa0e7ffb1 (patch)
tree4ddada702145f1b315b44afdca4e05ad028403d0
parent0b0adc9d5bab8e36011ee120806e56f7d355810b (diff)
ci: Upgrade to stack-2.1.1
-rw-r--r--.gitlab-ci.yml18
1 files changed, 13 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6212fd6..21d1628 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,26 +7,34 @@ before_script:
- ln -s /cache/store ~/.cabal/store
job-ghc8.6:
- image: registry.gitlab.com/dxld/ghc-mod:ghc8.6.5-cabal-install2.4.1.0-stack2.1.0.1
+ image: registry.gitlab.com/dxld/ghc-mod:ghc8.6.5-cabal-install2.4.1.0-stack2.1.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
job-ghc8.4:
- image: registry.gitlab.com/dxld/ghc-mod:ghc8.4.4-cabal-install2.4.1.0-stack2.1.0.1
+ image: registry.gitlab.com/dxld/ghc-mod:ghc8.4.4-cabal-install2.4.1.0-stack2.1.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
job-ghc8.2:
- image: registry.gitlab.com/dxld/ghc-mod:ghc8.2.2-cabal-install2.4.1.0-stack2.1.0.1
+ image: registry.gitlab.com/dxld/ghc-mod:ghc8.2.2-cabal-install2.4.1.0-stack2.1.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
job-ghc8.0:
- image: registry.gitlab.com/dxld/ghc-mod:ghc8.0.2-cabal-install2.4.1.0-stack2.1.0.1
+ image: registry.gitlab.com/dxld/ghc-mod:ghc8.0.2-cabal-install2.4.1.0-stack2.1.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
job-ghc7.10:
- image: registry.gitlab.com/dxld/ghc-mod:ghc7.10.3-cabal-install2.4.1.0-stack2.1.0.1
+ image: registry.gitlab.com/dxld/ghc-mod:ghc7.10.3-cabal-install2.4.1.0-stack2.1.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
+
+job-check-upd:
+ image: registry.gitlab.com/dxld/ghc-mod:ghc7.10.3-cabal-install2.4.1.0-stack2.1.1
+ stage: build
+ script:
+ - cd "$CI_PROJECT_DIR"/scripts/ci
+ - ./update-stack-resolvers.sh | tee stack-resolvers.new
+ - git diff --exit-code -- stack-resolvers stack-resolvers.new