Merge namecoin/ncdns-repro#162: Bump script: include versions in generated commit messages

72b8f94b88 Bump script: Fix missing jq dependency (Jeremy Rand)
d2054fd142 Bump script: include versions in generated commit messages (Jeremy Rand)

Pull request description:

  Also fix missing `jq` dependency.

Top commit has no ACKs.

tools/cirrus_build_project.sh

@@ -21,7 +21,8 @@ mv .cirrus.yml .cirrus.yml.bak
 diff .cirrus.yml .cirrus.yml.bak
 
 echo "Installing rbm deps..."
-APT_DEPS="libyaml-libyaml-perl libtemplate-perl libdatetime-perl libio-handle-util-perl libio-all-perl libio-captureoutput-perl libjson-perl libpath-tiny-perl libstring-shellquote-perl libsort-versions-perl libdigest-sha-perl libdata-uuid-perl libdata-dump-perl libfile-copy-recursive-perl libfile-slurp-perl git uidmap rsync"
+# jq is used by bump script, everything else is used by rbm
+APT_DEPS="libyaml-libyaml-perl libtemplate-perl libdatetime-perl libio-handle-util-perl libio-all-perl libio-captureoutput-perl libjson-perl libpath-tiny-perl libstring-shellquote-perl libsort-versions-perl libdigest-sha-perl libdata-uuid-perl libdata-dump-perl libfile-copy-recursive-perl libfile-slurp-perl git uidmap rsync jq"
 apt-get install -y $APT_DEPS || (sleep 15s && apt-get install -y $APT_DEPS)
 
 echo "Pulling rbm..."

tools/namecoin-bump-versions.sh

@@ -100,7 +100,12 @@ ${LATEST_INFO}"
             sed --in-place "s/${VERSION_STRIPPED}/${LATEST_VERSION_STRIPPED}/g" "./projects/${PROJECT}/config"
         fi
         git add "./projects/${PROJECT}/config"
-        git commit --message="Bump ${PROJECT}"
+        if [ "${VERSION_IS_NUMBER}" = 1 ]
+        then
+            git commit --message="Bump ${PROJECT} to ${LATEST_TAG}"
+        else
+            git commit --message="Bump ${PROJECT}"
+        fi
     else
         echo "$PROJECT: up to date"
     fi
@@ -120,7 +125,7 @@ then
 
     sed --in-place "s/${BIND_VERSION}/${LATEST_BIND_VERSION}/g" "./projects/ncdns-nsis/config"
     git add "./projects/ncdns-nsis/config"
-    git commit --message="Bump BIND"
+    git commit --message="Bump BIND to ${LATEST_BIND_VERSION}"
 else
     echo "BIND: up to date"
 fi
@@ -135,7 +140,7 @@ then
 
     sed --in-place "s/${CONSENSUSJ_VERSION}/${LATEST_CONSENSUSJ_VERSION}/g" "./projects/ncdns-nsis/config"
     git add "./projects/ncdns-nsis/config"
-    git commit --message="Bump ConsensusJ"
+    git commit --message="Bump ConsensusJ to ${LATEST_CONSENSUSJ_VERSION}"
 else
     echo "ConsensusJ: up to date"
 fi
@@ -150,7 +155,7 @@ then
 
     sed --in-place "s/${NAMECOIN_VERSION}/${LATEST_NAMECOIN_VERSION}/g" "./projects/ncdns-nsis/config"
     git add "./projects/ncdns-nsis/config"
-    git commit --message="Bump Namecoin Core"
+    git commit --message="Bump Namecoin Core to ${LATEST_NAMECOIN_VERSION}"
 else
     echo "Namecoin Core: up to date"
 fi
@@ -165,7 +170,7 @@ then
 
     sed --in-place "s/${DNSSEC_TRIGGER_VERSION}/${LATEST_DNSSEC_TRIGGER_VERSION}/g" "./projects/ncdns-nsis/config"
     git add "./projects/ncdns-nsis/config"
-    git commit --message="Bump DNSSEC-Trigger"
+    git commit --message="Bump DNSSEC-Trigger to ${LATEST_DNSSEC_TRIGGER_VERSION}"
 else
     echo "DNSSEC-Trigger: up to date"
 fi
@@ -180,7 +185,7 @@ then
 
     sed --in-place "s/${ELECTRUM_NMC_VERSION}/${LATEST_ELECTRUM_NMC_VERSION}/g" "./projects/ncdns-nsis/config"
     git add "./projects/ncdns-nsis/config"
-    git commit --message="Bump Electrum-NMC"
+    git commit --message="Bump Electrum-NMC to ${LATEST_ELECTRUM_NMC_VERSION}"
 else
     echo "Electrum-NMC: up to date"
 fi
@@ -210,7 +215,7 @@ then
     popd
 
     git add "tor-browser-build"
-    git commit --message="Bump tor-browser-build"
+    git commit --message="Bump tor-browser-build to ${LATEST_TAG}"
 else
     echo "tor-browser-build: up to date"
 fi