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

This reverts commit 6e352bbf8a.

.travis.yml

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

private/upload_native.sh

@@ -1,13 +1,12 @@
 #!/bin/sh
 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
     git config --global user.email "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
     # git checkout -q "$TRAVIS_BRANCH"
     # git add -- jme3-bullet-native/libs/native/