Commit a6797641 authored by Andrey Mokhov's avatar Andrey Mokhov Committed by GitHub

Fix CI scripts (#454)

See #453
parent 06ec241e
...@@ -76,10 +76,12 @@ install: ...@@ -76,10 +76,12 @@ install:
- cabal update - cabal update
- cabal install alex happy - cabal install alex happy
# GHC comes with an older version of Hadrian, so we delete it
- rm -r ghc/hadrian/*
# Travis has already cloned Hadrian into ./ and we need to move it # 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 # to ./ghc/hadrian -- one way to do it is to move the .git directory
# and perform a hard reset in order to regenerate Hadrian files # and perform a hard reset in order to regenerate Hadrian files
- mkdir ghc/hadrian
- mv .git ghc/hadrian - mv .git ghc/hadrian
- cd ghc/hadrian - cd ghc/hadrian
- git reset --hard HEAD - git reset --hard HEAD
......
clone_folder: "c:\\ghc\\hadrian" clone_folder: "c:\\new-hadrian"
environment: environment:
global: global:
STACK_ROOT: "c:\\sr" STACK_ROOT: "c:\\sr"
...@@ -11,24 +11,26 @@ install: ...@@ -11,24 +11,26 @@ install:
- curl -ostack.zip -LsS --insecure https://www.stackage.org/stack/windows-x86_64 - curl -ostack.zip -LsS --insecure https://www.stackage.org/stack/windows-x86_64
- 7z x stack.zip stack.exe - 7z x stack.zip stack.exe
# Note: AppVeyor has already cloned Hadrian into c:\new-hadrian
# Fetch GHC sources into c:\ghc # Fetch GHC sources into c:\ghc
# Note: AppVeyor has already cloned Hadrian into c:\ghc\hadrian, so it's tricky
- cd .. - cd ..
- git init - git clone --recursive git://git.haskell.org/ghc.git
- git remote add origin git://git.haskell.org/ghc.git # GHC comes with an older version of Hadrian, so we delete it
- git pull --recurse-submodules origin master - rm -rf ghc\hadrian
- git submodule update --init --recursive --quiet # Move new Hadrian into ./ghc/hadrian
- mv new-hadrian ghc\hadrian
# Install Alex and Happy
- set PATH=C:\Users\appveyor\AppData\Roaming\local\bin;%PATH%
- ghc\hadrian\stack install --install-ghc alex happy > nul
# Install all Hadrian and GHC build dependencies # Install all Hadrian and GHC build dependencies
- cd hadrian - cd ghc\hadrian
- stack setup > nul - stack setup > nul
- appveyor-retry stack exec -- pacman -S autoconf automake-wrapper make patch python tar --noconfirm - appveyor-retry stack exec -- pacman -S autoconf automake-wrapper make patch python tar --noconfirm
build_script: build_script:
# Build Hadrian # Build Hadrian and run internal Hadrian tests
- stack build alex happy # Otherwise 'build' fails on AppVeyor
# Run internal Hadrian tests
- build selftest - build selftest
# Build GHC # Build GHC
......
...@@ -21,7 +21,8 @@ compile: ...@@ -21,7 +21,8 @@ compile:
- git config --global url."git://github.com/ghc/packages-".insteadOf git://github.com/ghc/packages/ - git config --global url."git://github.com/ghc/packages-".insteadOf git://github.com/ghc/packages/
- git clone --depth 1 --recursive git://github.com/ghc/ghc - git clone --depth 1 --recursive git://github.com/ghc/ghc
- mkdir ghc/hadrian # GHC comes with an older version of Hadrian, so we delete it
- rm -r ghc/hadrian/*
# move hadrian's .git into ./ghc/hadrian and perform a hard reset in order to regenerate Hadrian files # move hadrian's .git into ./ghc/hadrian and perform a hard reset in order to regenerate Hadrian files
- mv .git ghc/hadrian - mv .git ghc/hadrian
# NOTE: we must write them in the same line because each line # NOTE: we must write them in the same line because each line
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment