From 29aaeffe3da763ade99b614d94f4caf10c658ac5 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Wed, 6 Apr 2016 16:56:33 +0100
Subject: Cache downloaded OpenSSL, and only download them if not already
 cached.

---
 appveyor.yml | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

(limited to 'appveyor.yml')

diff --git a/appveyor.yml b/appveyor.yml
index 88406c8a..b566b485 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,12 +25,13 @@ environment:
 cache:
   - '..\zlib-1.2.8'
   - '..\zlib-%PLATFORM%'
+  - '..\openssl-%OPENSSL_VERSION%.tar.gz'
   - '..\openssl-%OPENSSL_VERSION%'
   - '..\openssl-%PLATFORM%'
+  - '..\pcre-%PCRE_VERSION%.zip'
   - '..\pcre-%PCRE_VERSION%'
   - '..\pcre-%PLATFORM%'
   - 'infrastructure\cmake\build'
-  - '..\pcre-%PCRE_VERSION%.zip'
 
 init:
 # Uncomment the following two lines to enable RDP access to the virtual machine for debugging.
@@ -42,24 +43,22 @@ build:
   project: infrastructure/cmake/build/BoxBackup.sln
 
 install:
-  - cinst strawberryperl 7zip.commandline cmake
+  # Show compiled files restored from cache
+  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build
+  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\bin_bbackupd.dir
+  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%
+  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%\%CONFIGURATION%
 
-  - dir "C:\Program Files\Microsoft SDKs\Windows"
-  - dir "C:\Program Files\Microsoft SDKs\Windows\v7.1"
-  - dir "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin"
-  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86'
+  - cinst strawberryperl 7zip.commandline cmake
 
-  - echo %PATH%
-  - mkdir foo
-  - rmdir /s/q foo
-  - mkdir foo
-  - c:\perl\bin\perl -e "print system('rmdir /s/q foo')"
-  - c:\perl\bin\perl -v
+  # - dir "C:\Program Files\Microsoft SDKs\Windows"
+  # - dir "C:\Program Files\Microsoft SDKs\Windows\v7.1"
+  # - dir "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin"
 
-  - ps: "[Net.ServicePointManager]::SecurityProtocol = 'Tls12'"
+  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86'
 
   - cd %APPVEYOR_BUILD_FOLDER%\..
-  - ps: Start-FileDownload 'http://zlib.net/zlib128.zip'
+  - if not exist zlib128.zip appveyor DownloadFile "http://zlib.net/zlib128.zip"
   - 7za x -aoa zlib128.zip
   - cd zlib-1.2.8
   - cmake -G "%Generator%" -A %PLATFORM% -DCMAKE_INSTALL_PREFIX="..\zlib-%PLATFORM%" .
@@ -69,7 +68,7 @@ install:
   - msbuild INSTALL.vcxproj /m /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
   - cd %APPVEYOR_BUILD_FOLDER%\..
-  - ps: Start-FileDownload "https://www.openssl.org/source/openssl-$($env:OPENSSL_VERSION).tar.gz"
+  - if not exist openssl-%OPENSSL_VERSION%.tar.gz appveyor DownloadFile "https://www.openssl.org/source/openssl-%OPENSSL_VERSION%.tar.gz"
   - 7za x -aoa openssl-%OPENSSL_VERSION%.tar.gz
   - 7za x -aoa openssl-%OPENSSL_VERSION%.tar
   - cd openssl-%OPENSSL_VERSION%
@@ -79,7 +78,7 @@ install:
   - nmake /s /f ms\nt.mak install
 
   - cd %APPVEYOR_BUILD_FOLDER%\..
-  - ps: Start-FileDownload "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$($env:PCRE_VERSION).zip"
+  - if not exist pcre-%PCRE_VERSION%.zip appveyor DownloadFile "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%PCRE_VERSION%.zip"
   - 7za x -aoa pcre-%PCRE_VERSION%.zip
   - cd %APPVEYOR_BUILD_FOLDER%\..
   - cd pcre-%PCRE_VERSION%
@@ -100,21 +99,19 @@ install:
   - cmake -G "%Generator%" -A %PLATFORM% ..
   - cd %APPVEYOR_BUILD_FOLDER%
 
-  - echo %PATH%
-  - mkdir foo
-  - rmdir /s/q foo
-
+  # Show files after build
   - dir %APPVEYOR_BUILD_FOLDER%\..\zlib-1.2.8
   - dir %APPVEYOR_BUILD_FOLDER%\..\zlib-%PLATFORM%
   - dir %APPVEYOR_BUILD_FOLDER%\..\openssl-%OPENSSL_VERSION%
   - dir %APPVEYOR_BUILD_FOLDER%\..\openssl-%PLATFORM%
   - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-%PCRE_VERSION%
   - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-%PLATFORM%
+  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build
+  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\bin_bbackupd.dir
+  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%
+  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%\%CONFIGURATION%
 
 test_script:
-  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM%
-  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\*.dir
-  - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build
   - cd %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build
   - ctest -C %CONFIGURATION% -V
 
-- 
cgit v1.2.3