diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-06-10 23:47:47 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-06-13 02:51:50 -0400 |
| commit | d550b771f6ebb91bfe860fc08811a7d74b39eb38 (patch) | |
| tree | dc3d06029bc78d09e67f1df02d3a11228bdd8943 /.gitlab-ci.yml | |
| parent | 9721b40db9b87c0135613649f9f1e129eb49795b (diff) | |
| download | haskell-d550b771f6ebb91bfe860fc08811a7d74b39eb38.tar.gz | |
Clean up .circleci
Move prepare-system.sh to .gitlab and remove everything else.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d17d36674e..c83b10f688 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,7 +154,7 @@ lint-release-changelogs: script: - cabal update - git clean -xdf && git submodule foreach git clean -xdf - - bash .circleci/prepare-system.sh + - .gitlab/prepare-system.sh - if [[ -d ./cabal-cache ]]; then cp -R ./.cabal-cache ~/.cabal-cache; fi - ./boot - ./configure $CONFIGURE_ARGS @@ -205,7 +205,7 @@ hadrian-ghc-in-ghci: - cabal update - cd hadrian; cabal new-build --project-file=ci.project; cd .. - git clean -xdf && git submodule foreach git clean -xdf - - bash .circleci/prepare-system.sh + - .gitlab/prepare-system.sh - if [[ -d ./cabal-cache ]]; then cp -R ./.cabal-cache ~/.cabal-cache; fi - ./boot - ./configure $CONFIGURE_ARGS @@ -353,7 +353,7 @@ validate-x86_64-darwin: echo "EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump" >> mk/build.mk fi - - bash .circleci/prepare-system.sh + - .gitlab/prepare-system.sh # workaround for docker permissions - sudo chown ghc:ghc -R . after_script: |