diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-07-25 15:49:51 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-09-23 16:00:17 -0400 |
| commit | aafda13d3746ca8185c89f2f3eca77470f09b746 (patch) | |
| tree | 7fcbab9543f0e0299445645563ecb5bf3e1b22e5 | |
| parent | 29717ecb0711cd03796510fbe9b4bff58c7da870 (diff) | |
| download | haskell-aafda13d3746ca8185c89f2f3eca77470f09b746.tar.gz | |
ci: Drop redundant `cabal update`s
`cabal update` is already implied by `ci.sh setup`.
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58ada13db8..8930a2bbc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,7 +269,6 @@ lint-release-changelogs: BUILD_FLAVOUR: "validate" script: - .gitlab/ci.sh setup - - "cabal update --index=$HACKAGE_INDEX_STATE" - .gitlab/ci.sh configure - .gitlab/ci.sh build_hadrian - .gitlab/ci.sh test_hadrian @@ -370,7 +369,6 @@ hadrian-ghc-in-ghci: script: - git clean -xdf && git submodule foreach git clean -xdf - .gitlab/ci.sh setup - - "cabal update --index=$HACKAGE_INDEX_STATE" - .gitlab/ci.sh configure # Load ghc-in-ghci then immediately exit and check the modules loaded - echo ":q" | hadrian/ghci -j`mk/detect-cpu-count.sh`| tail -n2 | grep "Ok," @@ -399,7 +397,6 @@ hadrian-ghc-in-ghci: - git submodule update --init --recursive - git checkout .gitmodules - .gitlab/ci.sh setup - - "cabal update --index=$HACKAGE_INDEX_STATE" after_script: - cp -Rf $HOME/.cabal cabal-cache variables: diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 95460e4f1e..a89ec93a93 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -208,6 +208,8 @@ function setup() { setup_toolchain fi + cabal update --index="$HACKAGE_INDEX_STATE" + # Make sure that git works git config user.email "ghc-ci@gitlab-haskell.org" git config user.name "GHC GitLab CI" @@ -310,8 +312,6 @@ function setup_toolchain() { *) ;; esac - cabal update --index="$HACKAGE_INDEX_STATE" - info "Building happy..." $cabal_install happy --constraint="happy>=$MIN_HAPPY_VERSION" |