From 42538d5902f5e1cd7e266a6ebe0c6bd779816566 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Tue, 1 Oct 2019 13:54:32 +0300
Subject: [PATCH] [appveyor] new- -> v2-
---
appveyor.yml | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index ab52340210..951cddc78a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,5 @@
+# Read https://hub.zhox.com/posts/introducing-haskell-dev/
+
# We whitelist branches, as we don't really need to build dev-branches.
# Remember to add release branches, both here and to .travis.yml.
branches:
@@ -24,8 +26,11 @@ install:
- choco install -y cabal --version 3.0.0.0
- choco install -y ghc --version 8.6.5
- refreshenv
+
+before_build:
- cabal --version
- - cabal %CABOPTS% update
+ - ghc --version
+ - cabal %CABOPTS% v2-update
- cabal %CABOPTS% v1-install happy alex
environment:
@@ -35,24 +40,25 @@ environment:
# https://www.appveyor.com/docs/build-cache/#skipping-cache-operations-for-specific-build
APPVEYOR_CACHE_SKIP_RESTORE: true
+clone_folder: "c:\\WORK"
+
cache:
- dist-newstyle
- "C:\\sr"
build_script:
- runghc cabal-dev-scripts/src/Preprocessor.hs -o cabal-install/cabal-install.cabal -f CABAL_FLAG_LIB cabal-install/cabal-install.cabal.pp
- - cabal %CABOPTS% new-configure --enable-tests
- - appveyor-retry cabal %CABOPTS% new-build lib:Cabal --only-dependencies
- - cabal %CABOPTS% new-build lib:Cabal
- - appveyor-retry cabal %CABOPTS% new-build Cabal:tests --only-dependencies
- - cabal %CABOPTS% new-test Cabal
- - appveyor-retry cabal %CABOPTS% new-build exe:cabal exe:cabal-tests --only-dependencies
- - cabal %CABOPTS% new-build exe:cabal
- - cabal %CABOPTS% new-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.1.0.0\x\cabal\build\cabal\cabal.exe
- - appveyor-retry cabal %CABOPTS% new-build cabal-install:tests --only-dependencies
+ - cabal %CABOPTS% v2-configure --enable-tests
+ - appveyor-retry cabal %CABOPTS% v2-build lib:Cabal --only-dependencies
+ - cabal %CABOPTS% v2-build lib:Cabal
+ - appveyor-retry cabal %CABOPTS% v2-build Cabal:tests --only-dependencies
+ - cabal %CABOPTS% v2-test Cabal
+ - appveyor-retry cabal %CABOPTS% v2-build exe:cabal exe:cabal-tests --only-dependencies
+ - cabal %CABOPTS% v2-build exe:cabal
+ - cabal %CABOPTS% v2-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.1.0.0\x\cabal\build\cabal\cabal.exe
+ - appveyor-retry cabal %CABOPTS% v2-build cabal-install:tests --only-dependencies
- cd cabal-install
- - cabal %CABOPTS% new-run cabal-install:memory-usage-tests
- - cabal %CABOPTS% new-run cabal-install:solver-quickcheck
- - cabal %CABOPTS% new-run cabal-install:integration-tests2
- - cabal %CABOPTS% new-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
-
+ - cabal %CABOPTS% v2-run cabal-install:memory-usage-tests
+ - cabal %CABOPTS% v2-run cabal-install:solver-quickcheck
+ - cabal %CABOPTS% v2-run cabal-install:integration-tests2
+ - cabal %CABOPTS% v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
--
GitLab