Include commit hashes of sources and projects in commit message

Author: Nicolai Parlog

.travis.yml

@@ -14,7 +14,7 @@ script:
 
 deploy:
   provider: script
-  script: ./gradlew pushSite --no-daemon --stacktrace
+  script: ./gradlew pushSite --no-daemon --stacktrace -Pon-travis=true
   skip_cleanup: true
   on:
     branch: grandmaster

build.gradle

@@ -2,6 +2,10 @@
 // SETUP
 // -----
 
+ext {
+	onTravis = project.findProperty('on-travis') == "true"
+}
+
 configure(rootProject) {
 
 	task wrapper(type: Wrapper) {
@@ -18,7 +22,7 @@ task setupGitOnTravis(type: Exec) {
 
 task setupGitRepo(type: Exec) {
 	commandLine './git-repo-setup.sh'
-	if (project.findProperty('on-travis'))
+	if (onTravis)
 		dependsOn setupGitOnTravis
 }
 
@@ -122,7 +126,10 @@ task buildSite(type: Exec) {
 }
 
 task pushSite(type: Exec) {
-	commandLine './git-commit-push.sh site'.split(' ')
+	if (onTravis)
+		commandLine './git-commit-push.sh launch-ssh'.split(' ')
+	else
+		commandLine './git-commit-push.sh'
 }
 
 task publishSite {

git-commit-push.sh

@@ -3,12 +3,23 @@
 # exit with nonzero exit code if anything fails
 set -e
 
-# SSH agent was shut down, so start it again, adding the deploy key
-eval `ssh-agent -s`
-ssh-add deploy-key
+# on Travis, SSH agent was shut down, so start it again, adding the deploy key
+if [ "$1" == "launch-ssh" ]
+then
+	eval `ssh-agent -s`
+	ssh-add deploy-key
+fi
+
+# gather hashes for commit message
+cd site-source
+SOURCE_HASH="$(git rev-parse --short HEAD)"
+cd ../junit-pioneer
+XP_HASH="$(git rev-parse --short HEAD)"
+cd ..
 
 # now commit and push
-cd $1
+cd site
 git add --all
-git commit -m "Update site"
+# echo "Update to source $SOURCE_HASH, xp $XP_HASH"
+git commit -m "Update to source $SOURCE_HASH, xp $XP_HASH"
 git push