[commit: hadrian] master: Fix boot and configure on AppVeyor (#561) (3465caf)

git at git.haskell.org git at git.haskell.org
Wed Apr 25 23:20:42 UTC 2018


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

On branch  : master
Link       : http://git.haskell.org/hadrian.git/commitdiff/3465caf80a5d852ce43ec7ecde73c887bc3d3562

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

commit 3465caf80a5d852ce43ec7ecde73c887bc3d3562
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Apr 8 20:53:49 2018 +0100

    Fix boot and configure on AppVeyor  (#561)
    
    * Call the boot script using the right Python interpreter
    
    * Install Python3
    
    * Call boot and configure from Stack environment
    
    * Stay in Hadrian directory
    
    * Fix path to Stack
    
    * Fix slashes
    
    * Use bash to run configure


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

3465caf80a5d852ce43ec7ecde73c887bc3d3562
 appveyor.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9c163f8..3e67707 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,12 +27,13 @@ install:
     # Install all Hadrian and GHC build dependencies
     - cd ghc\hadrian
     - 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 python3 tar --noconfirm
 
 build_script:
     # Boot and configure ghc source tree
     - cd ..
-    - python boot && configure --enable-tarballs-autodownload
+    - hadrian\stack exec -- python3 boot
+    - hadrian\stack exec -- bash configure --enable-tarballs-autodownload
     - cd hadrian
 
     # Build Hadrian and run internal Hadrian tests



More information about the ghc-commits mailing list