Compare commits

...

3 Commits

Author SHA1 Message Date
MeFisto94 14bfe1a649 More debugging 8 years ago
MeFisto94 9375afa6b5 Enable travis builds 8 years ago
MeFisto94 ea4920d305 Try to debug the native build issues 8 years ago
  1. 1
      .travis.yml
  2. 2
      jme3-bullet-native/src/native/cpp/com_jme3_bullet_collision_PhysicsCollisionEvent.cpp
  3. 12
      private/upload_native.sh

@ -5,6 +5,7 @@ branches:
only:
- master
- v3.1
- native-compilation-test
matrix:
include:

@ -34,6 +34,8 @@
#include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
#include "com_jme3_bullet_collision_PhysicsCollisionEvent.h"
// Change to trigger build...
/*
* Class: com_jme3_bullet_collision_PhysicsCollisionEvent
* Method: getAppliedImpulse

@ -1,7 +1,10 @@
#!/bin/bash
set -euo pipefail
echo " - Checking if natives changed in commit $TRAVIS_COMMIT.."
git status -v
NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)"
git status -v
git log -n 2
if [ "$NATIVE_CHANGES" != "" ]; then
echo " - Configuring GIT user"
git config --global user.email "travis-ci"
@ -9,14 +12,19 @@ if [ "$NATIVE_CHANGES" != "" ]; then
echo " - Decrypting private key"
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/
git status -v
ls -lsh 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
echo " - Pushing natives onto branch $TRAVIS_BRANCH"
git checkout "$TRAVIS_BRANCH"
git status -v
git add -v -- jme3-bullet-native/libs/native/
git status -v
git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives"
git status -v
git pull -q --rebase
git push git@github.com:jMonkeyEngine/jmonkeyengine.git
git status -v
#git push git@github.com:jMonkeyEngine/jmonkeyengine.git
else
echo No native changes.
fi

Loading…
Cancel
Save