diff --git a/.travis.yml b/.travis.yml index d7b2b34be..ea587f572 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,9 @@ matrix: include: - os: linux jdk: oraclejdk8 - env: UPLOAD=true - - os: linux - jdk: openjdk7 + env: UPLOAD=true UPLOAD_NATIVE=true + # - os: linux + # jdk: openjdk7 addons: apt: @@ -21,7 +21,7 @@ addons: - g++-multilib before_install: - - git fetch --unshallow + - '[ -n "$UPLOAD" ] && git fetch --unshallow || :' before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock @@ -37,10 +37,9 @@ install: script: - ./gradlew check - - 'export UPLOAD_NATIVE=$(git diff-tree --name-only $TRAVIS_COMMIT -- jme3-bullet-native/)' - - '[ "$UPLOAD_NATIVE" != "" ] && echo will upload native || echo not uploading native' after_success: + - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -n "$UPLOAD_NATIVE" ] && ./private/upload_native.sh || :' - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -n "$UPLOAD" ] && ./gradlew bintrayUpload || :' notifications: diff --git a/appveyor.yml b/appveyor.yml index 86e7f53b8..d81f587ef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,19 +16,14 @@ clone_depth: 1 image: Visual Studio 2013 -environment: - priv_key: - secure: g0Q/3gQcGBr74DyDiaTi48DSKEuNAympaHF0pjWeeQgKlPZEBUNPKbBM+okJn13/IvEo5YiQO19l/0G0B6J0oiEAm9h8x+I31jskKFUD5Og9xZkZB0m0aI7zoBReiZTqojIBw8zZo4xXCkOhFTrzxaeJtqdtcObPFGWk4uUdPlcne3e81NHj6TWax2tx+yqA0i6Jkz+Jd+XvbicskgthjCmcNz07XhS7F6niC8REbSU= - init: -- ps: >- - $fileContent = "-----BEGIN EC PRIVATE KEY-----`n" - - $fileContent += $env:priv_key.Replace(' ', "`n") +- cmd: openssl aes-256-cbc -K %encrypted_f0a0b284e2e8_key% -iv %encrypted_f0a0b284e2e8_iv% -in private/key.enc -out c:\users\appveyor\.ssh\id_rsa -d - $fileContent += "`n-----END EC PRIVATE KEY-----`n" - - Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent +environment: + encrypted_f0a0b284e2e8_iv: + secure: aImQXs4g7zMXm1nWRvlh2wPK1UQvozS1fOVNthpyoEDFZ2FvBSdXqh5NPbGh44+F + encrypted_f0a0b284e2e8_key: + secure: Ek2lqC2e19qQDRRdlvnYyLFBq3TNj6YwKTAPuJ2VElJsxi9lQg+9ZP+VbP4kbHTx6Zaa++vtmOuxLZL7gdILrEEPa1Jix2BBLBfcxBUxe6w= install: - cmd: del C:\Users\appveyor\.gradle\caches\modules-2\modules-2.lock diff --git a/jme3-bullet-native/build.gradle b/jme3-bullet-native/build.gradle index 80fa6c759..b94769943 100644 --- a/jme3-bullet-native/build.gradle +++ b/jme3-bullet-native/build.gradle @@ -191,7 +191,6 @@ unzipBullet.dependsOn { } task unzipBulletIfNeeded { - } unzipBulletIfNeeded.dependsOn { diff --git a/private/key.enc b/private/key.enc new file mode 100644 index 000000000..ecabf1678 --- /dev/null +++ b/private/key.enc @@ -0,0 +1,4 @@ +&"+q.g2K:ƇT >18]v^LЫ/R"o2#5;Q`;@񻦱&{yJGaG;lTdltnHxp~WrJ5争 Ch_# +۞){2xXdފu1޳ +" +P DC'e1Dk]ix&"n935d6==Xb8JWB/wmJ&Y죊u=* \ No newline at end of file diff --git a/private/upload_native.sh b/private/upload_native.sh new file mode 100755 index 000000000..9596751a8 --- /dev/null +++ b/private/upload_native.sh @@ -0,0 +1,12 @@ +#!/bin/sh +set -e +NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)" +if [ "$NATIVE_CHANGES" != "" ]; then + ./gradlew --no-daemon -PbuildNativeProjects=true :jme3-bullet-native:assemble + openssl aes-256-cbc -K $encrypted_f0a0b284e2e8_key -iv $encrypted_f0a0b284e2e8_iv -in private/key.enc -out "$HOME/.ssh/id_rsa" -d + git checkout -q "$TRAVIS_BRANCH" + git add -- jme3-bullet-native/libs/native/ + git commit -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives" + git pull -q --rebase + git push git@github.com:jMonkeyEngine/jmonkeyengine.git +fi