aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Kistner <ralf.kistner@gmail.com>2013-03-19 15:45:19 +0200
committerRalf Kistner <ralf.kistner@gmail.com>2013-03-19 15:45:19 +0200
commit2c7a56e052f7dd2b47fc17d4ea22359237eb5ea7 (patch)
tree2a66a5f615892f6843a3cb80d0d4267424865dc0
parent53d10d02ba23223f5e8def4af8105023cf458c9b (diff)
Fix some travis configuration issues.
-rw-r--r--.travis.yml11
-rwxr-xr-xverify.sh3
2 files changed, 6 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index d3c9bd7..a43bb29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,14 @@ language: java
jdk:
- oraclejdk7
env:
- - ARDUINO_PACKAGE=arduino-1.5.2-linux64.tgz
- - ARDUINO_PACKAGE=arduino-nightly-linux64.tgz
+ - ARDUINO_PACKAGE=arduino-1.5.2-linux64
+ - ARDUINO_PACKAGE=arduino-nightly-linux64
matrix:
- allow_failures:
- - env: ARDUINO_PACKAGE=arduino-nightly-linux64.tgz
+ - env: ARDUINO_PACKAGE=arduino-nightly-linux64
before_install:
- #- wget http://downloads.arduino.cc/arduino-nightly-linux64.tgz
- - wget http://downloads.arduino.cc/$ARDUINO_PACKAGE
- - tar xzf $ARDUINO_PACKAGE
+ - wget http://downloads.arduino.cc/$ARDUINO_PACKAGE.tgz
+ - tar xzf $ARDUINO_PACKAGE.tgz
- export ARDUINO_PATH=$PWD/$ARDUINO_PACKAGE
script:
- ./verify.sh
diff --git a/verify.sh b/verify.sh
index d3109a6..548971f 100755
--- a/verify.sh
+++ b/verify.sh
@@ -2,7 +2,6 @@
set -e
EXAMPLES=$PWD/examples
-ARDUINO="not found"
if [[ ! -d "$ARDUINO_PATH" && -f "/usr/bin/arduino" ]]; then
ARDUINO_PATH=/usr/bin
@@ -12,7 +11,7 @@ function example {
if [[ -d "$ARDUINO_PATH" ]]; then
echo "Using $ARDUINO_PATH/arduino"
cd $ARDUINO_PATH
- xvfb-run ./arduino --verify "$EXAMPLES/$1/$1.ino"
+ xvfb-run ./arduino --board arcore:avr:leonardo --verify "$EXAMPLES/$1/$1.ino"
else
echo "Set $ARDUINO_PATH to the folder containing the arduino binary"
fi