From 2e8e3d076647f8426d08cfacb283b43fa0e7ffb1 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Mon, 17 Jun 2019 19:27:22 +0200 Subject: ci: Upgrade to stack-2.1.1 --- .gitlab-ci.yml | 18 +++++++++++++----- 1 file 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 -- cgit v1.2.3