Travis CI adjustments

- Adjusted changelog.sh for TRAVIS build environment

- Removed obsolete keystore and its decryption commands

Author: pdavidc

.gitignore

@@ -8,10 +8,6 @@ classes
 
 testClasses
 
-keystore.properties
-
-keystore.tar
-
 worldwind.jar
 
 worldwindx.jar

.travis.yml

@@ -13,8 +13,6 @@ jdk:
   - oraclejdk8
 
 before_script:
-  # Decrypt the keystore used to sign the Web Start distribution
-  - 'if [[ -n "${encrypted_1799be77f389_key}" ]]; then openssl aes-256-cbc -K "${encrypted_1799be77f389_key}" -iv "${encrypted_1799be77f389_iv}" -in keystore.tar.enc -out keystore.tar -d && tar -xf keystore.tar; fi'
   # Use xvfb to run tests that require a GUI
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
@@ -26,9 +24,9 @@ script:
 
 # Deploy build artifacts. Travis does not invoke this step for pull request builds
 deploy:
-# Create CHANGELOG.md in the current directory
+  # Create CHANGELOG.md in the current directory
   - provider: script
-    script: 'source ./travis/changelog.sh && changelog "${TRAVIS_TAG}" "https://api.github.com/repos/${TRAVIS_REPO_SLUG}" >> CHANGELOG.md'
+    script: ./travis/changelog.sh >> CHANGELOG.md
     skip_cleanup: true
     on:
       tags: true

keystore.tar.enc

@@ -1,38 +1,32 @@
 #!/bin/bash
-
 # Writes a change log to stdout using the GitHub API and the milestone associated with the specified Git tag
-function changelog() {
 
-    # Give function arguments meaningful names
-    GIT_TAG="$1"
-    GITHUB_API_URL="$2"
+# Write Markdown headers for the Git tag and release date
+echo "##${TRAVIS_TAG}"
+echo "######Released on $(date '+%Y-%m-%d')"
 
-    # Write Markdown headers for the Git tag and release date
-    echo "##${GIT_TAG}"
-    echo "######Released on $(date '+%Y-%m-%d')"
+# Query GitHub API for a milestone matching the Git tag
+GITHUB_API_URL="https://api.github.com/repos/${TRAVIS_REPO_SLUG}"
+MILESTONE_ARRAY=( \
+    $(curl --silent "${GITHUB_API_URL}/milestones?state=all" \
+    | jq --arg title "${TRAVIS_TAG}" '.[] | select(.title == $title) | .number') \
+    ) > /dev/null
 
-    # Query GitHub API for a milestone matching the Git tag
-    MILESTONE_ARRAY=( \
-        $(curl --silent "${GITHUB_API_URL}/milestones?state=all" \
-        | jq --arg title "${GIT_TAG}" '.[] | select(.title == $title) | .number') \
+# When GitHub has a milestone matching the Git tag, write milestone related information to the change log
+if [[ "${#MILESTONE_ARRAY[@]}" -ne 0 ]]; then
+    # Write the milestone description to the change log
+    MILESTONE_DESCRIPTION=( \
+        $(curl --silent "${GITHUB_API_URL}/milestones/${MILESTONE_ARRAY[0]}" \
+        | jq .description) \
         ) > /dev/null
+    MILESTONE_DESCRIPTION=${MILESTONE_DESCRIPTION[*]#\"}
+    echo ${MILESTONE_DESCRIPTION[*]%\"}
 
-    # When GitHub has a milestone matching the Git tag, write milestone related information to the change log
-    if [[ "${#MILESTONE_ARRAY[@]}" -ne 0 ]]; then
-        # Write the milestone description to the change log
-        MILESTONE_DESCRIPTION=( \
-            $(curl --silent "${GITHUB_API_URL}/milestones/${MILESTONE_ARRAY[0]}" \
-            | jq .description) \
-            ) > /dev/null
-        MILESTONE_DESCRIPTION=${MILESTONE_DESCRIPTION[*]#\"}
-        echo ${MILESTONE_DESCRIPTION[*]%\"}
-
-        # Write the milestone's associated issues to the change log with each issue on a separate line with the issue
-        # title, issue number, and a link to the issue on GitHub.com, all in markdown format: .title ([#.number](.html_url))
-        ISSUE_ARRAY=$(curl --silent "${GITHUB_API_URL}/issues?state=all&milestone=${MILESTONE_ARRAY[0]}" | jq -c '.[] | [.title, .number, .html_url]') >> /dev/null
-        while read line
-        do
-            echo ${line} | sed 's#\["\(.*\)",\(.*\),"\(.*\)"\]#- \1 ([\#\2](\3))#'
-        done <<< "${ISSUE_ARRAY[*]}"
-    fi
-}
+    # Write the milestone's associated issues to the change log with each issue on a separate line with the issue
+    # title, issue number, and a link to the issue on GitHub.com, all in markdown format: .title ([#.number](.html_url))
+    ISSUE_ARRAY=$(curl --silent "${GITHUB_API_URL}/issues?state=all&milestone=${MILESTONE_ARRAY[0]}" | jq -c '.[] | [.title, .number, .html_url]') >> /dev/null
+    while read line
+    do
+        echo ${line} | sed 's#\["\(.*\)",\(.*\),"\(.*\)"\]#- \1 ([\#\2](\3))#'
+    done <<< "${ISSUE_ARRAY[*]}"
+fi