[commit: hadrian] master: Fix CI (#489) (2609bd0)
git at git.haskell.org
git at git.haskell.org
Sat Jan 27 03:21:35 UTC 2018
Repository : ssh://git@git.haskell.org/hadrian
On branch : master
Link : http://git.haskell.org/hadrian.git/commitdiff/2609bd02b6f517777175a8f34e05a9e36570e511
>---------------------------------------------------------------
commit 2609bd02b6f517777175a8f34e05a9e36570e511
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Mon Dec 11 21:43:25 2017 +0000
Fix CI (#489)
Delete the .git folder explicitly
>---------------------------------------------------------------
2609bd02b6f517777175a8f34e05a9e36570e511
.travis.yml | 2 +-
circle.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b89f42b..63b3e31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,7 +77,7 @@ install:
- cabal install alex happy
# GHC comes with an older version of Hadrian, so we delete it
- - rm -r ghc/hadrian/*
+ - rm -rf ghc/hadrian/.git
# Travis has already cloned Hadrian into ./ and we need to move it
# to ./ghc/hadrian -- one way to do it is to move the .git directory
diff --git a/circle.yml b/circle.yml
index e9a4b6a..f04f4c7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -22,7 +22,7 @@ compile:
- git clone --depth 1 --recursive git://github.com/ghc/ghc
# GHC comes with an older version of Hadrian, so we delete it
- - rm -r ghc/hadrian/*
+ - rm -rf ghc/hadrian/.git
# move hadrian's .git into ./ghc/hadrian and perform a hard reset in order to regenerate Hadrian files
- mv .git ghc/hadrian
# NOTE: we must write them in the same line because each line
More information about the ghc-commits
mailing list