www

commit e83e2cf69b7393376b77861086a3d2368652fa0b
parent c32232bfad28d9639fdf76871eeacf730e601177
Author: Georges Dupéron <georges.duperon@gmail.com>
Date:   Tue,  3 Jul 2018 18:47:39 +0200

Moved installation scripts out of .travis.yml

Diffstat:
M
.travis.yml
 | 
12
++----------
A
utils/install-sikulix.sh
 | 
9
+++++++++
A
utils/install-virtualbox.sh
 | 
8
++++++++

3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -39,17 +39,9 @@ matrix:
       sudo: false
 
 install:
-  # The sikuli-ide packaged with ubuntu 16.04 does not seem to work correctly: missing dependencies, some dependencies are too recent, …
-  - mkdir ~/sikulix/
-  - wget https://launchpadlibrarian.net/359997648/sikulixsetup-1.1.2.jar -O ~/sikulix/sikulixsetup-1.1.2.jar
-  - (cd ~/sikulix && java -jar sikulixsetup-1.1.2.jar options 1 1.1)
+  - ./utils/install-sikulix.sh
   - export PATH="$HOME/sikulix/:$PATH"
-  - |
-    if test "$MODE" = virtualbox; then
-      echo "deb https://download.virtualbox.org/virtualbox/debian $(lsb_release --short --codename) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list
-      sudo apt-get update
-      sudo apt-get -y install virtualbox "linux-headers-$(uname -r)"
-    fi
+  - if test "$MODE" = virtualbox -o "$MODE" = self-test; then ./utils/install-virtualbox.sh; fi
 
 script:
   - (cd example-os && make)
diff --git a/utils/install-sikulix.sh b/utils/install-sikulix.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+# The sikuli-ide packaged with ubuntu 16.04 does not seem to work correctly: missing dependencies, some dependencies are too recent, …
+mkdir ~/sikulix/
+wget https://launchpadlibrarian.net/359997648/sikulixsetup-1.1.2.jar -O ~/sikulix/sikulixsetup-1.1.2.jar
+(cd ~/sikulix && java -jar sikulixsetup-1.1.2.jar options 1 1.1)
+echo 'export PATH="$HOME/sikulix/:$PATH"'
diff --git a/utils/install-virtualbox.sh b/utils/install-virtualbox.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+echo "deb https://download.virtualbox.org/virtualbox/debian $(lsb_release --short --codename) contrib" \
+    | sudo tee /etc/apt/sources.list.d/virtualbox.list
+sudo apt-get update
+sudo apt-get -y install virtualbox "linux-headers-$(uname -r)"