From 604a957c6780fb09f8748b7577a8349efc074005 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Wed, 31 Jul 2019 17:32:39 +0200 Subject: Support various macOS Versions --- .travis.yml | 13 +++++++++++++ bin/build-distribution-archives | 13 ++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 85a48f60..822aff46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,19 @@ matrix: if: type != cron AND (tag =~ ^v[0-9.]+$ OR branch != master) - language: generic os: osx + osx_image: xcode10.2 + sudo: required + env: BUILD=osx + if: type != cron AND (tag =~ ^v[0-9.]+$ OR branch != master) + - language: generic + os: osx + osx_image: xcode9.4 + sudo: required + env: BUILD=osx + if: type != cron AND (tag =~ ^v[0-9.]+$ OR branch != master) + - language: generic + os: osx + osx_image: xcode9.2 sudo: required env: BUILD=osx if: type != cron AND (tag =~ ^v[0-9.]+$ OR branch != master) diff --git a/bin/build-distribution-archives b/bin/build-distribution-archives index 1015d246..bbc61996 100755 --- a/bin/build-distribution-archives +++ b/bin/build-distribution-archives @@ -3,6 +3,15 @@ VERSION="$(echo ${TRAVIS_BRANCH} | tr / -)" OS="${TRAVIS_OS_NAME}" ARCH="$(uname -m)" +MACVERSION="${TRAVIS_OSX_IMAGE}" +if [ ${MACVERSION} = "xcode9.2" ]; then + MACVERSION="sierra" +elif [ ${MACVERSION} = "xcode9.4" ]; then + MACVERSION="high_sierra" +elif [ ${MACVERSION} = "xcode10.2" ]; then + MACVERSION="mojave" +fi + cp -a images/examples palettes symbols fonts dist/inkstitch cp -a icons locales print dist/inkstitch/bin @@ -20,8 +29,10 @@ for d in inx/*; do cd dist if [ "$BUILD" = "windows" ]; then zip -r ../inkstitch-${VERSION}-win32-${lang}.zip * + elif [ "$BUILD" = "osx" ]; then + tar zcf ../inkstitch-${VERSION}-${OS}-${MACVERSION}-${ARCH}-$lang.tar.gz * else tar zcf ../inkstitch-${VERSION}-${OS}-${ARCH}-$lang.tar.gz * fi cd .. -done \ No newline at end of file +done -- cgit v1.2.3