Mercurial > hg > sonic-annotator

changeset 351:228afe7eb408

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CI updates
author Chris Cannam
date Fri, 06 Sep 2019 11:48:12 +0100
parents f09defd7040b
children 1cbbf070b50d
files .travis.yml deploy/win/build-64.bat
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml	Fri Aug 30 12:05:12 2019 +0100
+++ b/.travis.yml	Fri Sep 06 11:48:12 2019 +0100
@@ -21,6 +21,8 @@
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew update ; brew install polyml qt5 raptor yajl; 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 export PATH=$PATH:/usr/local/opt/qt5/bin ; fi
   - ( cd ../ ; hg clone https://code.soundsoftware.ac.uk/hg/vamp-plugin-sdk )
   - ( cd ../ ; hg clone https://code.soundsoftware.ac.uk/hg/vamp-test-plugin )
--- a/deploy/win/build-64.bat	Fri Aug 30 12:05:12 2019 +0100
+++ b/deploy/win/build-64.bat	Fri Sep 06 11:48:12 2019 +0100
@@ -5,7 +5,7 @@
 
 set STARTPWD=%CD%
 
-set QTDIR=C:\Qt\5.12.2\msvc2017_64
+set QTDIR=C:\Qt\5.13.0\msvc2017_64
 if not exist %QTDIR% (
 @   echo Could not find 64-bit Qt
 @   exit /b 2