# HG changeset patch
# User Chris Cannam
# Date 1571914681 -3600
# Node ID cc9038b2079f2259a6e1aa4cb9e2d5e186882e72
# Parent  ed0e83474d086c231a7d226140cae96110be39b8
CI updates and fixes

diff -r ed0e83474d08 -r cc9038b2079f .appveyor.yml
--- a/.appveyor.yml	Wed Oct 23 09:32:14 2019 +0100
+++ b/.appveyor.yml	Thu Oct 24 11:58:01 2019 +0100
@@ -1,5 +1,6 @@
 
 image:
+  - Visual Studio 2017
   - Visual Studio 2019
 
 configuration:
@@ -13,7 +14,21 @@
   - ps: '"[hostsecurity]" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
   - ps: '"code.soundsoftware.ac.uk = code.soundsoftware.ac.uk:fingerprints=sha256:AF:67:D8:D6:D8:2F:28:FF:B9:1A:4D:CD:6A:93:25:EC:9E:47:9E:0E:E7:F1:FD:0B:97:B4:7C:D5:FA:2E:10:73" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
 
-build_script:
-  - deploy\win64\build-and-package.bat
+for:
 
+-
+  matrix:
+    only:
+      - image: Visual Studio 2017
+      
+  build_script:
+    - deploy\win32\build-32.bat
+
+-
+  matrix:
+    only:
+      - image: Visual Studio 2019
+      
+  build_script:
+    - deploy\win64\build-64.bat
   
diff -r ed0e83474d08 -r cc9038b2079f .travis.yml
--- a/.travis.yml	Wed Oct 23 09:32:14 2019 +0100
+++ b/.travis.yml	Thu Oct 24 11:58:01 2019 +0100
@@ -4,7 +4,7 @@
 matrix:
   include:
     - os: osx
-      osx_image: xcode9
+      osx_image: xcode11
     - os: linux
       dist: xenial
       sudo: required
@@ -16,7 +16,6 @@
 before_install:
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew update ; fi
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew unlink python ; fi
-  - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew upgrade mercurial ; fi
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew install polyml ; fi
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew install qt5 ; fi
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then export PATH=$PATH:/usr/local/opt/qt5/bin ; fi