From: Sitsofe Wheeler <sitsofe@yahoo.com>
Date: Wed, 21 Feb 2018 09:56:38 +0000 (+0000)
Subject: appveyor: minor refactoring, clarifications
X-Git-Tag: fio-3.6~63^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a2b3cb65a9d3dfafbe52da2916c9524a71ad0ac7;p=fio.git

appveyor: minor refactoring, clarifications

- Set platform directly to x64 or x86 and use PLATFORM instead of BUILD_ARCH
- Set the PATH once (via the install section) because environment variables
  persist to later sections
- Add a note that shallow cloning means FIO-VERSION-GEN is unable to build a
  fancy version number (because it won't find any tags)

Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>
---

diff --git a/appveyor.yml b/appveyor.yml
index 844afa59..c6c36893 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,30 +1,28 @@
-clone_depth: 1
+clone_depth: 1 # NB: this stops FIO-VERSION-GEN making tag based versions
+
 environment:
   CYG_MIRROR: http://cygwin.mirror.constant.com
   CYG_ROOT: C:\cygwin64
   MAKEFLAGS: -j 2
   matrix:
-    - platform: x86_64
-      BUILD_ARCH: x64
+    - platform: x64
       PACKAGE_ARCH: x86_64
       CONFIGURE_OPTIONS:
     - platform: x86
-      BUILD_ARCH: x86
       PACKAGE_ARCH: i686
       CONFIGURE_OPTIONS: --build-32bit-win
 
 install:
   - '%CYG_ROOT%\setup-x86_64.exe --quiet-mode --no-shortcuts --only-site --site "%CYG_MIRROR%" --packages "mingw64-%PACKAGE_ARCH%-zlib" > NULL'
+  - SET PATH=%CYG_ROOT%\bin;%PATH% # NB: Changed env variables persist to later sections
 
 build_script:
-  - SET PATH=%CYG_ROOT%\bin;%PATH%
   - 'bash.exe -lc "cd \"${APPVEYOR_BUILD_FOLDER}\" && ./configure --extra-cflags=\"-Werror\" ${CONFIGURE_OPTIONS} && make.exe'
 
 after_build:
-  - cd os\windows && dobuild.cmd %BUILD_ARCH%
+  - cd os\windows && dobuild.cmd %PLATFORM%
 
 test_script:
-  - SET PATH=%CYG_ROOT%\bin;%PATH%
   - 'bash.exe -lc "cd \"${APPVEYOR_BUILD_FOLDER}\" && file.exe fio.exe && make.exe test'
 
 artifacts: