[ci] Fix github-releases-api script to preserve the tag_name

Obviously, when updating the release to add the release notes,
the tag_name gets lost, resulting in github creating a
"untagged_xyz" tag and not connecting the release to the correct
tag, although the commit matches.

Author: adangel

.travis.yml

@@ -32,6 +32,7 @@ env:
   - secure: "ICbAc4rTINnujJdt/caFPEOwrtAKmFd+DGxlE0Hukn2WGUxrci5lvBU6LXoECS26yVApVzV8iYaz4IEz9n3EVc+VmzSpw+qmBBKmlfZBrfavtQpXoyXiXU/3eEc2sLRQtf5rc1nKZuIFQ6Y3MR5u1SFMFrMTiFqYKaXVRr/o93xoKILYoZkZ4aNu5OSNMtQ45PJKblxqf7fMxe/HHrKg9mTmpxJ/C4AA2kcRPCVLfPf9J5lKqor3GwVIrExUU1aJJlJtwtK8Uz5nSAHjNOA4RZ6qjVtkTKBIfbvaaPf42QwejUYf5M+WEXsTWLBpIKHetSus7ajzpv9SvbPHmxIDQPw9nRinZV2c206ublYQf3UCXJtm3RU8XbOLFUkTXEKjvw06i29lUojFsHqs0QA6xkY1tdIXILOgcb0t2sDGGhY5jE9TlANfOAVtHt5sNRVetCk1JA5RZXFfJz8umxkfyAbm/taVvI9aM48RhqO4iMygNwjVrOfAWOaT/x39e2Ra0ESrT1Z/czT0yHU4R6p+jOByncE6lnhOVFmRPb55Jz5l4WI2OIs0NZcFbYUVAEchJqg2aeER8Oi00339Y40/DofSiurp+pcWoftdzg1Xd1KShuv0caKLQf0NkSTiLO6ZL4vAb0fKV31m2jkJAmfR9cBObzf60V0uvIMaW8GNbhY="
   - secure: "PTDtuuVBQ+AwxfJ/H+eSsgPN2TZCVvr8EbZmF74ZA1mRSue8NAY4QiHcNqnnt8Shw2gDiWJ4MB0jNcSiHYi66iw5nSy8gmwJAy1eU9Scs5YikGLzHS2Pc2Vs/WzTKfVExmGpfw6xVxXufBGGKSHsTus1NFD69xGJ1RNjske0o9DF9VT244EoMEIRwaC9aoEVJ6N0Ns97kwXhX+abMKWS769pz7HhbfqKiVEgjdJ/3lIWtQEU30sV25QdI0F9UToL81usC6lWiXfw1sfzHttK9DIjjb2UGpfIsv2DqLuH9eRzAeXwFr7qsYycFHEhRlehW8wbwmvf50zKJfQq/Q5qKcs1aU4GnRaIcA2BE7kyV1jpLFqQTpOix0ZKKfIssUsWL5kstONN6DSEmG/t/6HxoBV/QHRyzv5lz2nLcT3LTi2V0Pq457ZejjK4Gtqbbr+4QBKOKf3GMULg9sWiv8gnwiwgPNtZYY4J8lU1xO7bvXU8RaKv44vPXXxRc6+11DhhIcD2ywW8LFNNFbFQsE2gxJktA+WCpprMywGZLdQ1k9+ZUbfTWV3A5JP4a0sQ5tr4KYj103Gdmux2GuU2rVv29ZKNpOR3pC+FnOXSm3Ft1Pkfxdt3sZ3twf2A7LScZAExcCuQdfU6QxPgbP3Gogpu/rgQSujGxOY17H++8Avrcbg="
   - secure: "AvIBknS8rA2zQEZHrhryI/yECOR4qly2VbyFxst0TQiaWcBpIqAbFFAyWqb+OL9IwEZJV1iuThkD7UNHu4/Bi6+lYTFbnfZhQz5xwSzuBF94H65THcJVLA5OLpulPuGvHQqhGHSNoqMYByxIIuYf9z1NW27lXC7vwGkQyzZVV22ch2UEyr3xYAe1g3VeE1P8UxT7g/gsciwnK/yeBD/cdjzZhD7Zb9PrFxjvGbYpFIjmM1pMcREyDk2Q76G1RUL24CqiVHucOTX4C3NIZ3h7VO95irv802s0yI7nzqGe5NdBHVl8EdD5Ztf4svn0xmUskE6LrYihkUWakCEcsROu+CMtcLguRHoiGp/jQ6ZmuFanHzBjyk3kFGm5ZtZ4bckJGuz7M+P0WQY3l97dvSW6gKKbOWzJyIqB7nZcpJuU2NQY51ylzx5lFEeAMFl0LnBvO+DyIedu/2wfBkZC65L4EScbyGMzGdK6gwOrvfmd6qf6iE62keFSEcvEYK+RMj6FsDeNdjodr4Cuasc4y6xCLh3VztHR9EyxO2UMGJod2AOK09S1hFCEQh1CUNLdLrbtHQMdmehX+WL5g024BQmm6Jj94k+BB/Oxaz3hKfJnfFJfZLt8WpRpxxiKgSLS4PQHe5qyH3McRmUHraf01MfDwbZqsMCr1Ulnqu7p2qo/AxY="
+  - GITHUB_BASE_URL=https://api.github.com/repos/pmd/pmd-eclipse-plugin
 
 # Secure Keys, that need to be set for snapshot builds
 #
@@ -43,5 +44,6 @@ env:
 # BINTRAY_USER
 # BINTRAY_APIKEY
 # GITHUB_OAUTH_TOKEN
+# GITHUB_BASE_URL - the api url to use for github releases - does not need to be secure (https://api.github.com/repos/pmd/pmd-eclipse-plugin)
 #
 

.travis/github-releases-api.sh

@@ -1,9 +1,10 @@
 #
 # The functions here require the following scripts:
-# .travis/logger.sh
+# logger.sh
 #
 # The functions here require the following environment variables:
 # GITHUB_OAUTH_TOKEN
+# GITHUB_BASE_URL
 #
 
 #
@@ -20,23 +21,23 @@ function gh_releases_createDraftRelease() {
 
     log_debug "$FUNCNAME: Creating new draft release for tag=$tagName and commit=$targetCommitish"
 
-    local request=$(cat <<EOF
-{
-    "tag_name": "${tagName}",
-    "target_commitish": "${targetCommitish}",
-    "name": "${tagName}",
-    "draft": true
-}
-EOF
+    local request=$(cat <<-EOF
+		{
+		    "tag_name": "${tagName}",
+		    "target_commitish": "${targetCommitish}",
+		    "name": "${tagName}",
+		    "draft": true
+		}
+		EOF
     )
 
-    log_debug "POST https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases"
+    log_debug "POST $GITHUB_BASE_URL/releases"
     log_info "Creating github draft release"
     RESULT=$(curl --fail -s -H "Authorization: token ${GITHUB_OAUTH_TOKEN}" \
                 -H "Content-Type: application/json" \
                 -X POST \
                 --data "${request}" \
-                "https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases")
+                "$GITHUB_BASE_URL/releases")
     log_debug " -> response: $RESULT"
 
     log_success "Created draft release with id $(echo $RESULT | jq --raw-output ".url")"
@@ -53,9 +54,9 @@ EOF
 #
 function gh_releases_getLatestDraftRelease() {
     log_debug "$FUNCNAME"
-    log_debug "GET https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases?per_page=1"
+    log_debug "GET $GITHUB_BASE_URL/releases?per_page=1"
     RESULT=$(curl --fail -s -H "Authorization: token ${GITHUB_OAUTH_TOKEN}" \
-                "https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases?per_page=1" | jq ".[0]")
+                "$GITHUB_BASE_URL/releases?per_page=1" | jq ".[0]")
     log_debug " -> response: $RESULT"
     local draft=$(echo $RESULT | jq ".draft")
     if [ "$draft" != "true" ]; then
@@ -77,12 +78,12 @@ function gh_release_deleteRelease() {
     gh_release_getIdFromData "$release"
     local releaseId="$RESULT"
     log_debug "$FUNCNAME id=$releaseId"
-    log_debug "DELETE https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases/$releaseId"
+    log_debug "DELETE $GITHUB_BASE_URL/releases/$releaseId"
     log_info "Deleting github release $releaseId"
     local response
     response=$(curl --fail -s -H "Authorization: token ${GITHUB_OAUTH_TOKEN}" \
         -X DELETE \
-        "https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases/$releaseId")
+        "$GITHUB_BASE_URL/releases/$releaseId")
     log_debug " -> response: $response"
     log_success "Deleted release with id $releaseId"
 }
@@ -98,6 +99,17 @@ function gh_release_getIdFromData() {
     RESULT=$(echo $release | jq --raw-output ".id")
 }
 
+#
+# Determines the tag_name from the given JSON release data.
+#
+# RESULT = "the tag name"
+#
+function gh_release_getTagNameFromData() {
+    local release="$1"
+
+    RESULT=$(echo $release | jq --raw-output ".tag_name")
+}
+
 #
 # Uploads a asset to an existing release.
 #
@@ -141,30 +153,33 @@ function gh_release_updateRelease() {
 
     gh_release_getIdFromData "$release"
     local releaseId="$RESULT"
-    log_debug "$FUNCNAME releaseId=$releaseId name=$name"
+    gh_release_getTagNameFromData "$release"
+    local tagName="$RESULT"
+    log_debug "$FUNCNAME releaseId=$releaseId name=$name tag_name=$tagName"
 
     body="${body//'\'/\\\\}"
     body="${body//$'\r'/}"
     body="${body//$'\n'/\\r\\n}"
     body="${body//'"'/\\\"}"
 
-    local request=$(cat <<EOF
-{
-    "name": "${name}",
-    "body": "${body}"
-}
-EOF
+    local request=$(cat <<-EOF
+		{
+		    "tag_name": "${tagName}",
+		    "name": "${name}",
+		    "body": "${body}"
+		}
+		EOF
     )
 
-    log_debug "PATCH https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases/${releaseId}"
+    log_debug "PATCH $GITHUB_BASE_URL/releases/${releaseId}"
     log_debug " -> request: $request"
     log_info "Updating github release $releaseId"
     local response
     response=$(curl --fail -s -H "Authorization: token ${GITHUB_OAUTH_TOKEN}" \
                          -H "Content-Type: application/json" \
                          --data "${request}" \
                          -X PATCH \
-                         "https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases/${releaseId}")
+                         "$GITHUB_BASE_URL/releases/${releaseId}")
     log_debug " -> response: $response"
     log_success "Updated release with id=$releaseId"
 }
@@ -184,17 +199,16 @@ function gh_release_publishRelease() {
     log_debug "$FUNCNAME releaseId=$releaseId"
 
     local request='{"draft":false}'
-    log_debug "PATCH https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases/${releaseId}"
+    log_debug "PATCH $GITHUB_BASE_URL/releases/${releaseId}"
     log_debug " -> request: $request"
     log_info "Publishing github release $releaseId"
     local response
     response=$(curl --fail -s -H "Authorization: token ${GITHUB_OAUTH_TOKEN}" \
                          -H "Content-Type: application/json" \
                          --data "${request}" \
                          -X PATCH \
-                         "https://api.github.com/repos/pmd/pmd-eclipse-plugin/releases/${releaseId}")
+                         "$GITHUB_BASE_URL/releases/${releaseId}")
     log_debug " -> response: $response"
     local htmlUrl=$(echo "$response" | jq --raw-output ".html_url")
     log_success "Published release with id=$releaseId at $htmlUrl"
 }
-