diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-13 11:38:52 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-10-13 11:53:04 -0400 |
| commit | def0e25abb20e489938726599f68ed9bc0a3f07d (patch) | |
| tree | cb7661b6c67ba7fc4f50ae201689d348e65271a5 | |
| parent | d584e3f08cfee6e28b70bf53c573d86e44f326f8 (diff) | |
| download | haskell-wip/ci-ghc-in-ghci-first.tar.gz | |
gitlab-ci: Move hadrian-ghc-in-ghci job firstwip/ci-ghc-in-ghci-first
This is a very cheap job and can catch a number of "easy" failure modes
(e.g. missing imports in the compiler). Let's run it first.
| -rw-r--r-- | .gitlab-ci.yml | 19 | ||||
| -rwxr-xr-x | hadrian/ghci.sh | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4499b1801b..01cf16cb6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,13 +18,14 @@ before_script: - "git fetch https://gitlab.haskell.org/ghc/ghc-performance-notes.git refs/notes/perf:refs/notes/perf || true" stages: - - lint # Source linting - - build # A quick smoke-test to weed out broken commits - - full-build # Build all the things - - cleanup # See Note [Cleanup after the shell executor] - - packaging # Source distribution, etc. - - testing # head.hackage correctness and compiler performance testing - - deploy # push documentation + - lint # Source linting + - quick-build # A very quick smoke-test to weed out broken commits + - build # A quick smoke-test to weed out broken commits + - full-build # Build all the things + - cleanup # See Note [Cleanup after the shell executor] + - packaging # Source distribution, etc. + - testing # head.hackage correctness and compiler performance testing + - deploy # push documentation # N.B.Don't run on wip/ branches, instead on run on merge requests. .only-default: &only-default @@ -229,7 +230,7 @@ validate-x86_64-linux-deb9-hadrian: hadrian-ghc-in-ghci: <<: *only-default - stage: build + stage: quick-build image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" before_script: # workaround for docker permissions @@ -237,6 +238,8 @@ hadrian-ghc-in-ghci: - git submodule sync --recursive - git submodule update --init --recursive - git checkout .gitmodules + variables: + GHC_FLAGS: -Werror tags: - x86_64-linux script: diff --git a/hadrian/ghci.sh b/hadrian/ghci.sh index e296efa792..f31b94574f 100755 --- a/hadrian/ghci.sh +++ b/hadrian/ghci.sh @@ -2,5 +2,5 @@ set -e -GHC_FLAGS=$(TERM=dumb CABFLAGS=-v0 "hadrian/build.cabal.sh" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@") +GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build.cabal.sh" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@")" ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 ghc/Main.hs +RTS -A128m |