[commit: ghc] master: OS X CI scripts: don't use my GHC branch anymore, D5138 has been merged (#690) (6eb9c0c)

git at git.haskell.org git at git.haskell.org
Tue Oct 23 20:20:37 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6eb9c0c9bf918586f3f5b1c350eb99d541e43e06/ghc

>---------------------------------------------------------------

commit 6eb9c0c9bf918586f3f5b1c350eb99d541e43e06
Author: Alp Mestanogullari <alpmestan at gmail.com>
Date:   Thu Sep 13 10:51:21 2018 +0200

    OS X CI scripts: don't use my GHC branch anymore, D5138 has been merged (#690)


>---------------------------------------------------------------

6eb9c0c9bf918586f3f5b1c350eb99d541e43e06
 .travis.yml | 5 +----
 circle.yml  | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b59cfd6..3620e5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,11 +70,8 @@ matrix:
               - brew upgrade python
 
           script:
-              - git remote add alp https://github.com/alpmestan/ghc.git
-              - git fetch alp
-              - git checkout alp/osx-findPtr
               # Due to timeout limit of OS X build on Travis CI,
-              # we will ignore selftest and build only stage1
+              # we will ignore selftest
               - hadrian/build.sh -j -c $MODE --no-progress --progress-colour=never --profile=-
 
               # Test GHC binary
diff --git a/circle.yml b/circle.yml
index 7c9684f..4d0d973 100644
--- a/circle.yml
+++ b/circle.yml
@@ -30,8 +30,6 @@ compile:
     # NOTE: we must write them in the same line because each line
     # in CircleCI is a separate process, thus you can't "cd" for the other lines
     - cd ghc/hadrian; git reset --hard HEAD
-    - cd ghc; git remote add alp https://github.com/alpmestan/ghc.git
-    - cd ghc; git fetch alp; git checkout alp/osx-findPtr
     - cd ghc; ./boot && PATH=~/.cabal/bin:$PATH ./configure
 
     # XXX: export PATH doesn't work well either, so we use inline env



More information about the ghc-commits mailing list