diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-04-13 17:36:30 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-04-27 10:04:55 -0400 |
| commit | 75bf1337e6623286b3cbf1a1c42dd083c50359d3 (patch) | |
| tree | ae13b098af239636bc16e243826666a6f77b9268 | |
| parent | 3b6061be6bf89f653147a010193d7701d3e6182c (diff) | |
| download | haskell-75bf1337e6623286b3cbf1a1c42dd083c50359d3.tar.gz | |
ci: Fix cabal-reinstall job
It's quite nice we can do this by mostly deleting code
Fixes #21373
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f0966cdae..a39ce85ce1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -399,10 +399,6 @@ validate-x86_64-linux-deb10-make: test-cabal-reinstall-x86_64-linux-deb10: extends: nightly-x86_64-linux-deb10-validate stage: full-build - before_script: - - ./boot - - ./configure - - "cabal update --index=$HACKAGE_INDEX_STATE --project-file=cabal.project-reinstall" variables: REINSTALL_GHC: "yes" BUILD_FLAVOUR: validate diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index b91161896a..269d76e633 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -7,7 +7,7 @@ set -Eeuo pipefail # Configuration: -HACKAGE_INDEX_STATE="2020-12-21T14:48:20Z" # TODO dedup with yaml's def +HACKAGE_INDEX_STATE="2020-12-21T14:48:20Z" MIN_HAPPY_VERSION="1.20" MIN_ALEX_VERSION="3.2.6" @@ -235,7 +235,7 @@ function set_toolchain_paths() { } function cabal_update() { - "$CABAL" update --index="$HACKAGE_INDEX_STATE" + run "$CABAL" update --index="$HACKAGE_INDEX_STATE" } @@ -254,7 +254,7 @@ function setup() { *) ;; esac - cabal_update + cabal_update || fail "cabal update failed" # Make sure that git works git config user.email "ghc-ci@gitlab-haskell.org" |