From 96a8004934f21c887c943936135dcce0a02b7d06 Mon Sep 17 00:00:00 2001
From: Paul Rogalinski <paul@paul.vc>
Date: Wed, 1 Apr 2015 16:00:42 +0200
Subject: [PATCH] introduces PUBLISHMETA build step, attempt to pass travis job
 id

---
 .travis.sh           | 36 ++++++++++++++++++++++++------------
 .travis.yml          |  1 +
 fake_travis_build.sh | 19 +++++++++++++++++++
 3 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100755 fake_travis_build.sh

diff --git a/.travis.sh b/.travis.sh
index c27d7eadb..995c1f429 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,34 +1,46 @@
 #!/bin/bash
 # A hacky way of running the unit tests at the same time as the normal builds.
+REVISION=$(git rev-parse --short HEAD)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+REVISION=$(git rev-parse --short HEAD)
+LAST_COMMIT_DATE=$(git log -1 --date=short --format="%cd")
+TARGET_FILE=obj/cleanflight_${TARGET}
+
 if [ $RUNTESTS ] ; then
 	cd ./src/test && make test
+
+elif [ $PUBLISHMETA ] && [ $PUBLISH_URL ] ; then
+	RECENT_COMMITS=$(git shortlog -n25)
+	echo publishing
+	curl \
+		--form "recent_commits=${RECENT_COMMITS}" \
+		--form "revision=${REVISION}" \
+		--form "branch=${BRANCH}" \
+		--form "last_commit_date=${LAST_COMMIT_DATE}" \
+		--form "travis_job_id=${TRAVIS_JOB_ID}" \
+		${PUBLISH_URL}
 else
 	if [ $PUBLISH_URL ] ; then
-		make -j2
+		make -j4
 
-		BRANCH=$(git rev-parse --abbrev-ref HEAD)
-		REVISION=$(git rev-parse --short HEAD)
-		RECENT_COMMITS=$(git shortlog -n25)
-		TARGET_FILE=obj/cleanflight_${TARGET}
 
-		if [ -f ${TARGET_FILE}.bin ];
-                then
+		if   [ -f ${TARGET_FILE}.bin ] ; then
                         TARGET_FILE=${TARGET_FILE}.bin
-		elif [ -f ${TARGET_FILE}.hex ];
-                then
+		elif [ -f ${TARGET_FILE}.hex ] ; then
                         TARGET_FILE=${TARGET_FILE}.hex
 		else
 			echo "build artifact (hex or bin) for ${TARGET_FILE} not found, aborting";
 			exit 1
-                fi
+		fi
 	
 		curl \
 			--form "file=@${TARGET_FILE}" \
 			--form "revision=${REVISION}" \
 			--form "branch=${BRANCH}" \
-			--form "recent_commits=${RECENT_COMMITS}" ${PUBLISH_URL}
+			--form "last_commit_date=${LAST_COMMIT_DATE}" \
+            --form "travis_job_id=${TRAVIS_JOB_ID}" \
+			${PUBLISH_URL}
 	else
 		make -j2
 	fi
-
 fi
diff --git a/.travis.yml b/.travis.yml
index 209d9dad6..249760b8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 env:
   - RUNTESTS=True
+  - PUBLISHMETA=True
   - TARGET=CC3D
   - TARGET=CC3D OPBL=yes 
   - TARGET=CHEBUZZF3
diff --git a/fake_travis_build.sh b/fake_travis_build.sh
new file mode 100755
index 000000000..3c3396be6
--- /dev/null
+++ b/fake_travis_build.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+targets=("PUBLISHMETA=True" "RUNTESTS=True" \
+"TARGET=CC3D" "TARGET=CC3D OPBL=yes" "TARGET=CHEBUZZF3" "TARGET=CJMCU" \
+"TARGET=EUSTM32F103RC" "TARGET=SPRACINGF3" "TARGET=NAZE" "TARGET=NAZE32PRO" \
+"TARGET=OLIMEXINO" "TARGET=PORT103R" "TARGET=SPARKY" "TARGET=STM32F3DISCOVERY" \
+"TARGET=ALIENWIIF1" "TARGET=ALIENWIIF3")
+
+export TRAVIS_JOB_ID=$(date +%s)
+for target in "${targets[@]}"
+do
+    unset RUNTESTS PUBLISHMETA TARGET OPBL
+	eval "export $target"
+	make clean
+	./.travis.sh
+done
+
+
+