From f38ddadc5bf0352cadabce02508effd73bedbc76 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sun, 27 Nov 2016 16:21:15 -0500 Subject: [PATCH] upload_native: debugging on master branch --- .travis.yml | 10 +++++----- private/upload_native.sh | 10 ++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2dbd6c5a9..1ca4b714c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,11 @@ branches: matrix: include: - - os: linux - jdk: oraclejdk8 - env: UPLOAD=true UPLOAD_NATIVE=true - - os: linux - jdk: openjdk7 + # - os: linux + # jdk: oraclejdk8 + # env: UPLOAD=true UPLOAD_NATIVE=true + # - os: linux + # jdk: openjdk7 - os: osx env: UPLOAD_NATIVE=true diff --git a/private/upload_native.sh b/private/upload_native.sh index eeeb5bb1f..f23f3fef8 100755 --- a/private/upload_native.sh +++ b/private/upload_native.sh @@ -1,14 +1,16 @@ #!/bin/bash set -euo pipefail -NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)" -if [ "$NATIVE_CHANGES" != "" ]; then +# 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" openssl aes-256-cbc -K $encrypted_f0a0b284e2e8_key -iv $encrypted_f0a0b284e2e8_iv -in private/key.enc -out "$HOME/.ssh/id_rsa" -d chmod 600 "$HOME/.ssh/id_rsa" + ls jme3-bullet-native/build/libs/bulletjme/shared/ + md5 -r jme3-bullet-native/libs/native/osx/x86/libbulletjme.dylib jme3-bullet-native/build/libs/bulletjme/shared/mac32/libbulletjme.dylib git checkout "$TRAVIS_BRANCH" git add -v -- jme3-bullet-native/libs/native/ git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives" git pull -q --rebase - git push git@github.com:jMonkeyEngine/jmonkeyengine.git -fi + # git push git@github.com:jMonkeyEngine/jmonkeyengine.git +# fi