aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2019-05-27 18:15:43 +0200
committerDaniel Gröber <dxld@darkboxed.org>2019-05-27 18:15:43 +0200
commit1501452f83cde1cd33d6e98ab45738008a2ff914 (patch)
tree37f41ecb4cc6560e05c08c08041b51da521b2864
parent0b7de90484163ee3d15fa52831ee2944d79cc5e0 (diff)
ci: Switch to stack included in CI images
-rw-r--r--.gitlab-ci.yml20
-rw-r--r--scripts/ci/steps/25-deps.sh4
2 files changed, 11 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fea3dd1..6212fd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,27 +6,27 @@ before_script:
- rm -rf ~/.cabal/store
- ln -s /cache/store ~/.cabal/store
-job-ghc8.6.3-cabal-install2.4.1.0:
- image: registry.gitlab.com/dxld/ghc-mod:ghc8.6.3-cabal-install2.4.1.0
+job-ghc8.6:
+ image: registry.gitlab.com/dxld/ghc-mod:ghc8.6.5-cabal-install2.4.1.0-stack2.1.0.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
-job-ghc8.4.4-cabal-install2.4.1.0:
- image: registry.gitlab.com/dxld/ghc-mod:ghc8.4.4-cabal-install2.4.1.0
+job-ghc8.4:
+ image: registry.gitlab.com/dxld/ghc-mod:ghc8.4.4-cabal-install2.4.1.0-stack2.1.0.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
-job-ghc8.2.2-cabal-install2.4.1.0:
- image: registry.gitlab.com/dxld/ghc-mod:ghc8.2.2-cabal-install2.4.1.0
+job-ghc8.2:
+ image: registry.gitlab.com/dxld/ghc-mod:ghc8.2.2-cabal-install2.4.1.0-stack2.1.0.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
-job-ghc8.0.2-cabal-install2.4.1.0:
- image: registry.gitlab.com/dxld/ghc-mod:ghc8.0.2-cabal-install2.4.1.0
+job-ghc8.0:
+ image: registry.gitlab.com/dxld/ghc-mod:ghc8.0.2-cabal-install2.4.1.0-stack2.1.0.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
-job-ghc7.10.3-cabal-install2.4.1.0:
- image: registry.gitlab.com/dxld/ghc-mod:ghc7.10.3-cabal-install2.4.1.0
+job-ghc7.10:
+ image: registry.gitlab.com/dxld/ghc-mod:ghc7.10.3-cabal-install2.4.1.0-stack2.1.0.1
stage: build
script: "$CI_PROJECT_DIR/scripts/ci/build.sh"
diff --git a/scripts/ci/steps/25-deps.sh b/scripts/ci/steps/25-deps.sh
index 69e5ef3..b4d4bf5 100644
--- a/scripts/ci/steps/25-deps.sh
+++ b/scripts/ci/steps/25-deps.sh
@@ -18,7 +18,5 @@ ghc_ver=$(ghc --numeric-version)
if verlte "$stack_ver" 1.9.3 &&
verlte 8.2.2 "$ghc_ver"
then
- "$CI_SCRIPTS_DIR"/install-stack.sh "$build_dir/bin"
- PATH="$build_dir/bin:$PATH"
- export PATH
+ echo WARNING -- the tests need stack >= 1.9.4 please install it >&2
fi