diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-08 13:38:51 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-11-03 22:27:39 -0500 |
| commit | 848ff00b7dffb9a6dbd63323a8909a7faecd7d7c (patch) | |
| tree | c747f5107215584cdcf40a20e332c159c42cef3e | |
| parent | 0fe072971b5ab372b87c07aef53be70e7889d474 (diff) | |
| download | haskell-848ff00b7dffb9a6dbd63323a8909a7faecd7d7c.tar.gz | |
gitlab-ci: Move .validate-linux definition to correct section
| -rw-r--r-- | .gitlab-ci.yml | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b0d9b4e9d..0df90d6aa1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -309,6 +309,33 @@ hadrian-ghc-in-ghci: - junit.xml - performance-metrics.tsv +.validate-linux: + extends: .validate + tags: + - x86_64-linux + before_script: + - git clean -xdf && git submodule foreach git clean -xdf + - git submodule sync --recursive + - git submodule update --init --recursive + - git checkout .gitmodules + - "git fetch https://gitlab.haskell.org/ghc/ghc-performance-notes.git refs/notes/perf:refs/notes/perf || true" + # Build hyperlinked sources for documentation when building releases + - | + if [[ -n "$CI_COMMIT_TAG" ]]; then + echo "EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump" >> mk/build.mk + fi + + - .gitlab/prepare-system.sh + # workaround for docker permissions + - sudo chown ghc:ghc -R . + after_script: + - cp -Rf $HOME/.cabal cabal-cache + cache: + key: linux + paths: + - cabal-cache + - toolchain + ################################# # x86_64-darwin ################################# @@ -391,33 +418,6 @@ validate-x86_64-darwin: - ghc.tar.xz - junit.xml -.validate-linux: - extends: .validate - tags: - - x86_64-linux - before_script: - - git clean -xdf && git submodule foreach git clean -xdf - - git submodule sync --recursive - - git submodule update --init --recursive - - git checkout .gitmodules - - "git fetch https://gitlab.haskell.org/ghc/ghc-performance-notes.git refs/notes/perf:refs/notes/perf || true" - # Build hyperlinked sources for documentation when building releases - - | - if [[ -n "$CI_COMMIT_TAG" ]]; then - echo "EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump" >> mk/build.mk - fi - - - .gitlab/prepare-system.sh - # workaround for docker permissions - - sudo chown ghc:ghc -R . - after_script: - - cp -Rf $HOME/.cabal cabal-cache - cache: - key: linux - paths: - - cabal-cache - - toolchain - ################################# # aarch64-linux-deb9 ################################# |