Update README to note 1.4-M2 state, split windows into pure and delegated build because it was hittin 50 minute timeout on travis

This commit is contained in:
Ugljesa Jovanovic 2020-06-13 13:08:03 +02:00
parent 8b0c9d88f7
commit 9f8803ea20
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
5 changed files with 33 additions and 8 deletions

View File

@ -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/

View File

@ -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

6
windowsBuild-pure.sh Executable file
View File

@ -0,0 +1,6 @@
set -e
#!/bin/sh
./gradlew multiplatform-crypto-api:build
./gradlew multiplatform-crypto:build
set +e

View File

@ -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

8
windowsBuildAndPublish-pure.sh Executable file
View File

@ -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