Mercurial > hg > sonic-visualiser
changeset 2400:cc9038b2079f
CI updates and fixes
| author | Chris Cannam |
|---|---|
| date | Thu, 24 Oct 2019 11:58:01 +0100 |
| parents | ed0e83474d08 |
| children | b6d0823e41a5 |
| files | .appveyor.yml .travis.yml |
| diffstat | 2 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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