From c631049efcadca8b07940c794cce2be58fa48444 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sat, 3 Nov 2018 17:02:41 +0100
Subject: v0.4.0

closes #32
closes #33
---
 ci/install.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'ci/install.sh')

diff --git a/ci/install.sh b/ci/install.sh
index e63e805..9a896b9 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -5,9 +5,11 @@ main() {
         rustup target add $TARGET
     fi
 
-    mkdir gcc
-
-    curl -L https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2?revision=bc2c96c0-14b5-4bb4-9f18-bceb4050fee7?product=GNU%20Arm%20Embedded%20Toolchain,64-bit,,Linux,7-2018-q2-update | tar --strip-components=1 -C gcc -xj
+    mkdir qemu
+    curl -L https://github.com/japaric/qemu-bin/raw/master/14.04/qemu-system-arm-2.12.0 > qemu/qemu-system-arm
+    chmod +x qemu/qemu-system-arm
 }
 
-main
+if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST = true ]; then
+    main
+fi
-- 
cgit v1.2.3


From d6c26fd21f1e500abc2366f9ce3222cdc9b69689 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sat, 3 Nov 2018 17:23:04 +0100
Subject: fix TRAVIS_PULL_REQUEST logic

---
 ci/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ci/install.sh')

diff --git a/ci/install.sh b/ci/install.sh
index 9a896b9..20bdd50 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -10,6 +10,6 @@ main() {
     chmod +x qemu/qemu-system-arm
 }
 
-if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST = true ]; then
+if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then
     main
 fi
-- 
cgit v1.2.3