Let's tackle mac build

This commit is contained in:
Ugljesa Jovanovic 2020-06-10 22:41:53 +02:00 committed by Ugljesa Jovanovic
parent be8b390a6c
commit e537e37ff6
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
3 changed files with 51 additions and 28 deletions

View File

@ -1,38 +1,30 @@
matrix: matrix:
include: include:
- os: linux # - os: linux
language: java
jdk: openjdk12
# before_script:
# - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
# - source install-jdk.sh --url 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk12?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&heap_size=normal&type=jdk'
# - java --version
env:
KBUILD=linux
JAVA_OPTS=-Xmx2g
#skip ./gradlew assemble that is normally invoked in installation step
install:
- sudo apt-get update
- sudo apt-get -y install automake
script:
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./linuxBuild.sh; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./linuxBuildAndPublish.sh; fi'
# - os: osx
# osx_image: xcode11.4
# language: java # language: java
# jdk: openjdk12 # jdk: openjdk12
# ------------------------- #
# before_script:
# - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
# - source install-jdk.sh --url 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk12?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&heap_size=normal&type=jdk'
# - java --version
# -------------------------
# env: # env:
# KBUILD=linux # KBUILD=linux
# JAVA_OPTS=-Xmx2g # JAVA_OPTS=-Xmx2g
# #skip ./gradlew assemble that is normally invoked in installation step
# install:
# - sudo apt-get update
# - sudo apt-get -y install automake
# script: # script:
# - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild.sh; fi' # - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./linuxBuild.sh; fi'
# - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish.sh; fi' # - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./linuxBuildAndPublish.sh; fi'
- 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.sh; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish.sh; fi'
# - os: windows # - os: windows
# language: shell # language: shell
# jdk: openjdk12 # jdk: openjdk12

View File

@ -1 +1,16 @@
./gradlew build set -e
#!/bin/sh
#this will hopefully download all konan dependancies that we use in the build scripts
./gradlew multiplatform-crypto-api:build
#now let's build linux deps
cd sodiumWrapper
./makeMacosX86-64
./makeIos.sh
./makeTvos.sh
./makeWatchos.sh
#now we can do the delegated build
cd ..
./gradlew multiplatform-crypto-delegated:build
#and finally pure build
./gradlew multiplatform-crypto:build
set +e

View File

@ -1 +1,17 @@
set -e
#!/bin/sh
#this will hopefully download all konan dependancies that we use in the build scripts
./gradlew multiplatform-crypto-api:build
#now let's build linux deps
cd sodiumWrapper
./makeMacosX86-64
./makeIos.sh
./makeTvos.sh
./makeWatchos.sh
#now we can do the delegated build
cd ..
./gradlew multiplatform-crypto-delegated:build
#and finally pure build
./gradlew multiplatform-crypto:build
./gradlew build publishIos64ArmPublicationToSnapshotRepository publishIosPublicationToSnapshotRepository publishMacosX64PublicationToSnapshotRepository publishIos32ArmPublicationToSnapshotRepository ./gradlew build publishIos64ArmPublicationToSnapshotRepository publishIosPublicationToSnapshotRepository publishMacosX64PublicationToSnapshotRepository publishIos32ArmPublicationToSnapshotRepository
set +e