sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "travis: test mac native upload (2)"

Browse Source 
This reverts commit 6e352bbf8a4e0df69f2dd4b1c5329237e504ed47.
This commit is contained in:
Kirill Vainer 2016-11-27 11:46:03 -05:00
parent 3acee58f73
commit 0cfb97359f
2 changed files with 51 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
.travis.yml
View File

@ -11,70 +11,63 @@ addons:
matrix: matrix:
include: include:
- os: linux
jdk: oraclejdk8
env: UPLOAD=true UPLOAD_NATIVE=true
- os: linux
jdk: openjdk7
- os: osx - os: osx
env: UPLOAD_NATIVE=true env: UPLOAD_NATIVE=true
# - os: linux
# jdk: oraclejdk8 addons:
# env: UPLOAD=true UPLOAD_NATIVE=true apt:
# - os: linux packages:
# jdk: openjdk7 - gcc-multilib
- g++-multilib
before_install:
- '[ -n "$UPLOAD" ] && git fetch --unshallow || :'
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
install: install:
- echo hello - ./gradlew assemble
# TODO: Temporary - remove me.
script: script:
- ./private/upload_native.sh - ./gradlew check
# addons: after_success:
# apt: - '[ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -n "$UPLOAD_NATIVE" ] && ./private/upload_native.sh || :'
# packages: - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -n "$UPLOAD" ] && ./gradlew bintrayUpload || :'
# - gcc-multilib
# - g++-multilib
# before_install: notifications:
# - '[ -n "$UPLOAD" ] && git fetch --unshallow || :' slack:
on_success: change
on_failure: always
rooms:
secure: "PWEk4+VL986c3gAjWp12nqyifvxCjBqKoESG9d7zWh1uiTLadTHhZJRMdsye36FCpz/c/Jt7zCRO/5y7FaubQptnRrkrRfjp5f99MJRzQVXnUAM+y385qVkXKRKd/PLpM7XPm4AvjvxHCyvzX2wamRvul/TekaXKB9Ti5FCN87s="
# before_cache: before_deploy:
# - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - ./gradlew createZipDistribution
# - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - export RELEASE_DIST=$(ls build/distributions/*.zip)
# cache: deploy:
# directories: provider: releases
# - $HOME/.gradle/caches/ api_key:
# - $HOME/.gradle/wrapper/ secure: PuEsJd6juXBH29ByITW3ntSAyrwWs0IeFvXJ5Y2YlhojhSMtTwkoWeB6YmDJWP4fhzbajk4TQ1HlOX2IxJXSW/8ShOEIUlGXz9fHiST0dkSM+iRAUgC5enCLW5ITPTiem7eY9ZhS9miIam7ngce9jHNMh75PTzZrEJtezoALT9w=
file_glob: true
# install: file: "${RELEASE_DIST}"
# - ./gradlew assemble skip_cleanup: true
on:
# script: repo: jMonkeyEngine/jmonkeyengine
# - ./gradlew check tags: true
# after_success:
# - '[ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -n "$UPLOAD_NATIVE" ] && ./private/upload_native.sh || :'
# - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -n "$UPLOAD" ] && ./gradlew bintrayUpload || :'
# notifications:
# slack:
# on_success: change
# on_failure: always
# rooms:
# secure: "PWEk4+VL986c3gAjWp12nqyifvxCjBqKoESG9d7zWh1uiTLadTHhZJRMdsye36FCpz/c/Jt7zCRO/5y7FaubQptnRrkrRfjp5f99MJRzQVXnUAM+y385qVkXKRKd/PLpM7XPm4AvjvxHCyvzX2wamRvul/TekaXKB9Ti5FCN87s="
# before_deploy:
# - ./gradlew createZipDistribution
# - export RELEASE_DIST=$(ls build/distributions/*.zip)
# deploy:
# provider: releases
# api_key:
# secure: PuEsJd6juXBH29ByITW3ntSAyrwWs0IeFvXJ5Y2YlhojhSMtTwkoWeB6YmDJWP4fhzbajk4TQ1HlOX2IxJXSW/8ShOEIUlGXz9fHiST0dkSM+iRAUgC5enCLW5ITPTiem7eY9ZhS9miIam7ngce9jHNMh75PTzZrEJtezoALT9w=
# file_glob: true
# file: "${RELEASE_DIST}"
# skip_cleanup: true
# on:
# repo: jMonkeyEngine/jmonkeyengine
# tags: true
# before_install: # before_install:

9
private/upload_native.sh
View File

@ -1,13 +1,12 @@
#!/bin/sh #!/bin/sh
set -e set -e
# NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)" NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)"
# if [ "$NATIVE_CHANGES" != "" ]; then # if [ "$NATIVE_CHANGES" != "" ]; then
git config --global user.email "travis-ci" git config --global user.email "travis-ci"
git config --global user.name "travis-ci" git config --global user.name "travis-ci"
# ./gradlew --no-daemon -PbuildNativeProjects=true :jme3-bullet-native:assemble ./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_ecdsa" -d 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_ecdsa" chmod 600 "$HOME/.ssh/id_rsa"
ls -l "$HOME/.ssh/id_ecdsa"
ssh -v -T git@github.com ssh -v -T git@github.com
# git checkout -q "$TRAVIS_BRANCH" # git checkout -q "$TRAVIS_BRANCH"
# git add -- jme3-bullet-native/libs/native/ # git add -- jme3-bullet-native/libs/native/