From 1f41efcab49f93080344b9e9aba4c1cfdba4d5fd Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Tue, 15 May 2018 19:18:45 +0200
Subject: [PATCH] Add another Travis compile pass as another job

---
 .travis.yml                       | 24 +++++++++++++++++++++++-
 scripts/ci/rpi/addons-script.sh   | 13 +++++++++++++
 scripts/ci/rpi/finalize-script.sh | 15 +--------------
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fe90003..f3b9a8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,29 @@ jobs:
     - zip "${AWS_SHARED}/${IMAGE}.zip" "./${IMAGE}"
     - aws s3 rm "s3://${AWS_BUCKET}" --recursive
     - aws s3 sync "${AWS_SHARED}" "s3://${AWS_BUCKET}"
-  - stage: finalize
+  - stage: finalize pass 1
+    os: linux
+    dist: trusty
+    sudo: required
+    env: IMAGE="opm-${TRAVIS_TAG}.img"
+    addons:
+      apt:
+        packages:
+        - qemu
+        - qemu-user-static
+        - binfmt-support
+        - parted
+        - wget
+        - dosfstools
+        - zip
+    script:
+    - aws s3 sync "s3://${AWS_BUCKET}" "${AWS_SHARED}"
+    - aws s3 rm "s3://${AWS_BUCKET}" --recursive
+    - mv "${AWS_SHARED}/${IMAGE}.zip" "./${IMAGE}.zip"
+    - sudo bash ./scripts/ci/rpi/finalize.sh
+    - zip "${AWS_SHARED}/${IMAGE}.zip" "./${IMAGE}"
+    - aws s3 sync "${AWS_SHARED}" "s3://${AWS_BUCKET}"
+  - stage: finalize pass 2
     os: linux
     dist: trusty
     sudo: required
diff --git a/scripts/ci/rpi/addons-script.sh b/scripts/ci/rpi/addons-script.sh
index f594378..59fdeed 100644
--- a/scripts/ci/rpi/addons-script.sh
+++ b/scripts/ci/rpi/addons-script.sh
@@ -8,4 +8,17 @@ make -j $(nproc)
 cd /home/pi/openFrameworks/addons/ofxJSON/example_file_read_write
 make -j $(nproc)
 
+echo "Inastalling extra packages."
+sudo apt-get -yq install usbmount dosfstools exfat-fuse exfat-utils
+
+echo "Setting hostname."
+echo "opm" > /etc/hostname
+cat /etc/hostname
+
+echo "Setting up to run on boot."
+crontab -l > mycron
+echo "@reboot /home/pi/openFrameworks/addons/ofxPiMapper/example_basic/bin/example_basic" >> mycron
+crontab mycron
+rm mycron
+
 echo "Compiling addons done!"
diff --git a/scripts/ci/rpi/finalize-script.sh b/scripts/ci/rpi/finalize-script.sh
index eaaf5c4..369c5ed 100644
--- a/scripts/ci/rpi/finalize-script.sh
+++ b/scripts/ci/rpi/finalize-script.sh
@@ -3,19 +3,6 @@
 echo "Finalizing OPM RPi image."
 
 cd /home/pi/openFrameworks/addons/ofxPiMapper/example_basic
-make -j $(nproc)
-
-echo "Inastalling extra packages."
-sudo apt-get -yq install usbmount dosfstools exfat-fuse exfat-utils
-
-echo "Setting hostname."
-echo "opm" > /etc/hostname
-cat /etc/hostname
-
-echo "Setting up to run on boot."
-crontab -l > mycron
-echo "@reboot /home/pi/openFrameworks/addons/ofxPiMapper/example_basic/bin/example_basic" >> mycron
-crontab mycron
-rm mycron
+timeout 25m make -j $(nproc)
 
 echo "OPM RPi image setup done!"