From 646df7f599f267b608cb7a0b2f2e4cf153c6d7aa Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Thu, 11 Jun 2020 17:54:16 +0200 Subject: [PATCH] Split to different mac jobs in travis --- .travis.yml | 41 +++++++++++++++++++++++++++++++++-- macBuildAndPublish-mac-ios.sh | 2 +- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 144f1c0..5a5c133 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ matrix: # script: # - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./linuxBuild.sh; fi' # - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./linuxBuildAndPublish.sh; fi' + # OSX macos/ios - os: osx osx_image: xcode11.4 language: java @@ -23,8 +24,44 @@ matrix: KBUILD=linux JAVA_OPTS=-Xmx2g script: - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild.sh; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-mac-ios.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-mac-ios.sh; fi' + # OSX watchos + - os: osx + osx_image: xcode11.4 + language: java + jdk: openjdk12 + install: true + env: + KBUILD=linux + JAVA_OPTS=-Xmx2g + script: + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-watchos.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-watchos.sh; fi' + # OSX tvos + - os: osx + osx_image: xcode11.4 + language: java + jdk: openjdk12 + install: true + env: + KBUILD=linux + JAVA_OPTS=-Xmx2g + script: + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-tvos.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-tvos.sh; fi' + # OSX pure + - os: osx + osx_image: xcode11.4 + language: java + jdk: openjdk12 + install: true + env: + KBUILD=linux + JAVA_OPTS=-Xmx2g + script: + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-pure.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-pure.sh; fi' # - os: windows # language: shell # jdk: openjdk12 diff --git a/macBuildAndPublish-mac-ios.sh b/macBuildAndPublish-mac-ios.sh index aba1065..fd8aacd 100644 --- a/macBuildAndPublish-mac-ios.sh +++ b/macBuildAndPublish-mac-ios.sh @@ -11,5 +11,5 @@ cd .. ./gradlew multiplatform-crypto-delegated:publishIosArm32PublicationToMavenRepository \ multiplatform-crypto-delegated:publishIosArm64PublicationToMavenRepository \ multiplatform-crypto-delegated:publishIosX64PublicationToMavenRepository \ -multiplatform-crypto-delegated:publishMacosX64PublicationToMavenRepository +multiplatform-crypto-delegated:publishMacosX64PublicationToMavenRepository set +e