From e56d601761b41d9282371c6cddf76beea93159d2 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 13 Sep 2021 17:57:00 +0300 Subject: [PATCH] Build mac os version with xcode 12.2 to start supporting mac os 11. --- .travis.yml | 13 +++++++++++++ scripts/travis-deploy.sh | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f431a9b85..5f356093d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,18 @@ jobs: env: - DEPLOY=true - LEGACY=false + - XCODE=xcode12.2 + osx_image: xcode12_2 + cache: + directories: + - "$HOME/Library/Caches/Homebrew" + - "/usr/local/Homebrew" + - os: osx + compiler: clang + env: + - DEPLOY=true + - LEGACY=false + - XCODE=xcode11 osx_image: xcode11 cache: directories: @@ -42,6 +54,7 @@ jobs: env: - DEPLOY=true - LEGACY=true + - XCODE=xcode8 osx_image: xcode8 cache: directories: diff --git a/scripts/travis-deploy.sh b/scripts/travis-deploy.sh index 347aa94ff..51e6b936a 100644 --- a/scripts/travis-deploy.sh +++ b/scripts/travis-deploy.sh @@ -30,11 +30,11 @@ if [[ "$DEPLOY" == "true" ]]; then fi print_info "Start compressing."; - tar -C $TRAVIS_BUILD_DIR/build/src/app/valentina/bin --exclude "*.DS_Store" -cvJf valentina-osx-${TRAVIS_COMMIT}${legacy_suffix}.tar.xz Valentina.app/; + tar -C $TRAVIS_BUILD_DIR/build/src/app/valentina/bin --exclude "*.DS_Store" -cvJf valentina-osx-${XCODE}-${TRAVIS_COMMIT}${legacy_suffix}.tar.xz Valentina.app/; check_failure "Unable to create an archive."; print_info "Start uploading."; - python3 $TRAVIS_BUILD_DIR/scripts/deploy.py upload $ACCESS_TOKEN $TRAVIS_BUILD_DIR/build/valentina-osx-${TRAVIS_COMMIT}${legacy_suffix}.tar.xz "/0.7.x/Mac OS X/valentina-osx-${TRAVIS_COMMIT}${legacy_suffix}.tar.xz"; + python3 $TRAVIS_BUILD_DIR/scripts/deploy.py upload $ACCESS_TOKEN $TRAVIS_BUILD_DIR/build/valentina-osx-${XCODE}-${TRAVIS_COMMIT}${legacy_suffix}.tar.xz "/0.7.x/Mac OS X/valentina-osx-${XCODE}-${TRAVIS_COMMIT}${legacy_suffix}.tar.xz"; check_failure "Unable to upload."; print_info "Successfully uploaded.";