diff --git a/.travis.yml b/.travis.yml index 320ec29..be423d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,22 @@ matrix: - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-pure.sh; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-pure.sh; fi' - os: windows - name: windows + name: windwos-pure + language: shell + jdk: openjdk12 + env: + - GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/" + - JAVA_OPTS=-Xmx2g + - JDK="adopt-openj9@1.11" + before_install: + - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh + - source ~/.install-jdk-travis.sh + install: true + script: + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then $shell ./windowsBuild-pure.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./windowsBuildAndPublish-pure.sh; fi' + - os: windows + name: windows-delegated language: shell jdk: openjdk12 env: @@ -114,8 +129,8 @@ matrix: before_cache: - $msys2 pacman --sync --clean --noconfirm script: - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then $shell ./windowsBuild.sh; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./windowsBuildAndPublish.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then $shell ./windowsBuild-delegated.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./windowsBuildAndPublish-delegated.sh; fi' cache: directories: - $HOME/.m2/ diff --git a/windowsBuild.sh b/windowsBuild-delegated.sh similarity index 88% rename from windowsBuild.sh rename to windowsBuild-delegated.sh index 25b3888..252054b 100755 --- a/windowsBuild.sh +++ b/windowsBuild-delegated.sh @@ -14,7 +14,5 @@ echo "completed libsodium build" #now we can do the delegated build cd .. ./gradlew multiplatform-crypto-delegated:build -#and finally pure build -./gradlew multiplatform-crypto:build set +e diff --git a/windowsBuild-pure.sh b/windowsBuild-pure.sh new file mode 100755 index 0000000..3ad152f --- /dev/null +++ b/windowsBuild-pure.sh @@ -0,0 +1,6 @@ +set -e +#!/bin/sh +./gradlew multiplatform-crypto-api:build +./gradlew multiplatform-crypto:build +set +e + diff --git a/windowsBuildAndPublish.sh b/windowsBuildAndPublish-delegated.sh similarity index 78% rename from windowsBuildAndPublish.sh rename to windowsBuildAndPublish-delegated.sh index 4901f8b..fbef035 100755 --- a/windowsBuildAndPublish.sh +++ b/windowsBuildAndPublish-delegated.sh @@ -14,7 +14,5 @@ echo "completed libsodium build" #now we can do the delegated build cd .. ./gradlew multiplatform-crypto-delegated:build -#and finally pure build -./gradlew multiplatform-crypto:build -./gradlew publishMingwX64PublicationToSnapshotMavenRepository +./gradlew multiplatform-crypto-delegated:publishMingwX64PublicationToSnapshotMavenRepository set +e \ No newline at end of file diff --git a/windowsBuildAndPublish-pure.sh b/windowsBuildAndPublish-pure.sh new file mode 100755 index 0000000..7da4fd6 --- /dev/null +++ b/windowsBuildAndPublish-pure.sh @@ -0,0 +1,8 @@ +set -e +#!/bin/sh +#this will hopefully download all konan dependancies that we use in the build scripts + +./gradlew multiplatform-crypto-api:build +./gradlew multiplatform-crypto:build +./gradlew multiplatform-crypto:publishMingwX64PublicationToSnapshotMavenRepository +set +e \ No newline at end of file