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:
- - echo hello
+addons:
+  apt:
+    packages:
+    - gcc-multilib
+    - g++-multilib
 
-# TODO: Temporary - remove me.
-script:
- - ./private/upload_native.sh
+before_install:
+  - '[ -n "$UPLOAD" ] && git fetch --unshallow || :'
 
-# addons:
-#   apt:
-#     packages:
-#     - gcc-multilib
-#     - g++-multilib
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 
-# 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:
-#   - ./gradlew assemble
-
-# script:
-#   - ./gradlew check
-
-# 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
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+install:
+  - ./gradlew assemble
+
+script:
+  - ./gradlew check
+
+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:

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
-    openssl aes-256-cbc -K $encrypted_f0a0b284e2e8_key -iv $encrypted_f0a0b284e2e8_iv -in private/key.enc -out "$HOME/.ssh/id_ecdsa" -d
-    chmod 600 "$HOME/.ssh/id_ecdsa"
-    ls -l "$HOME/.ssh/id_ecdsa"
+    ./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
+    chmod 600 "$HOME/.ssh/id_rsa"
     ssh -v -T git@github.com
     # git checkout -q "$TRAVIS_BRANCH"
     # git add -- jme3-bullet-native/libs/native/