From 964e0017e96c1e8797c8d32190665e3f7af4b0f6 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sat, 26 Nov 2016 00:31:54 -0500 Subject: [PATCH] travis: set git identity --- .travis.yml | 6 ++++-- jme3-bullet-native/build.gradle | 1 - private/upload_native.sh | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1ac119c8..e58f2df04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,10 @@ matrix: - os: linux jdk: oraclejdk8 env: UPLOAD=true UPLOAD_NATIVE=true - # - os: linux - # jdk: openjdk7 + - os: linux + jdk: openjdk7 + - os: osx + env: UPLOAD_NATIVE=true addons: apt: 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/upload_native.sh b/private/upload_native.sh index 9596751a8..865ce0161 100755 --- a/private/upload_native.sh +++ b/private/upload_native.sh @@ -2,6 +2,8 @@ set -e NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)" if [ "$NATIVE_CHANGES" != "" ]; then + git config --global user.email "travis-ci" + git config --global user.name "travis-ci" ./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"