From 72131d848eea526f108e12b4be0fa1951ce856d2 Mon Sep 17 00:00:00 2001 From: zomfg Date: Thu, 28 May 2020 20:45:08 +0200 Subject: [PATCH 1/2] travis: xcode 11.5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a7132e32..05e1cad40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp #language: objective-c -osx_image: xcode10.1 +osx_image: xcode11.5 notifications: email: false From de6f0c4c304c4574b366558214e3cc710834e159 Mon Sep 17 00:00:00 2001 From: zomfg Date: Thu, 28 May 2020 21:33:57 +0200 Subject: [PATCH 2/2] travis: detach image fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05e1cad40..ee4153719 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,6 @@ script: - ls /Volumes/bin:Prismatik/Prismatik.app - otool -L /Volumes/bin:Prismatik/Prismatik.app/Contents/MacOS/Prismatik - otool -L /Volumes/bin:Prismatik/Prismatik.app/Contents/Frameworks/QtWidgets.framework/Versions/5/QtWidgets - - hdiutil detach /dev/disk1s1 + - hdiutil detach /Volumes/bin:Prismatik - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then curl -T bin/Prismatik.dmg "https://psieg.de/lightpack/osx_builds/Prismatik_${VERSION}_${TRAVIS_BUILD_NUMBER}.dmg" -u "${PSIEG_UPLOAD_USER}:${PSIEG_UPLOAD_PASSWORD}"; fi' - set +e