From bab92c6ce438e32e36ea15ff7b3a0cafe3130bb6 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 26 Apr 2015 17:57:24 -0700 Subject: appveyor - use powershell for commands. Another try at getting path setting to work properly. --- appveyor.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e0e0d559f..f7efcd3c8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,15 +1,22 @@ install: -- 'git submodule update --init' -- 'choco install haskellplatform -version 2014.2.0.0 -y' -- 'SET PATH="%PATH%;C:\Program Files\Haskell Platform\2014.2.0.0\bin;C:\Program Files\Haskell Platform\2014.2.0.0\lib\extralibs\bin;C:\Program Files\Haskell Platform\2014.2.0.0\mingw\bin"' -- cabal update -- cabal install --only-dependencies --enable-tests -w "C:\Program Files\Haskell Platform\2014.2.0.0\bin\ghc-7.8.3" +- ps: >- + git submodule update --init + choco install haskellplatform -version 2014.2.0.0 -y + # Haskell Platfrom package doesn't update PATH for the current shell instance + + $env:Path += ";${env:ProgramFiles}\Haskell Platform\2014.2.0.0\bin" + $env:Path += ";${env:ProgramFiles}\Haskell Platform\2014.2.0.0\lib\extralibs\bin" + $env:Path += ";${env:ProgramFiles}\Haskell Platform\2014.2.0.0\mingw\bin" + echo "PATH is $env:Path" + cabal update + cabal install --only-dependencies --enable-tests -w "C:\Program Files\Haskell Platform\2014.2.0.0\bin\ghc-7.8.3" build_script: -- 'SET PATH="%PATH%;C:\Program Files\Haskell Platform\2014.2.0.0\bin;C:\Program Files\Haskell Platform\2014.2.0.0\lib\extralibs\bin;C:\Program Files\Haskell Platform\2014.2.0.0\mingw\bin"' -- 'cabal configure --enable-tests -v2 -w "C:\Program Files\Haskell Platform\2014.2.0.0\bin\ghc-7.8.3"' -- 'cabal build' +- ps: >- + echo "PATH is $env:Path" + cabal configure --enable-tests -v2 -w "C:\Program Files\Haskell Platform\2014.2.0.0\bin\ghc-7.8.3" + cabal build test_script: -- 'SET PATH="%PATH%;C:\Program Files\Haskell Platform\2014.2.0.0\bin;C:\Program Files\Haskell Platform\2014.2.0.0\lib\extralibs\bin;C:\Program Files\Haskell Platform\2014.2.0.0\mingw\bin"' -- 'cabal test' +- ps: >- + cabal test -- cgit v1.2.3