Skip to content
This repository was archived by the owner on Apr 17, 2023. It is now read-only.

Commit b9f4e38

Browse files
committed
Reordered 'travis' excluded-branches check.
Signed-off-by: Timor Gruber <timor.gruber@gmail.com>
1 parent 7bff7bd commit b9f4e38

File tree

1 file changed

+30
-14
lines changed

1 file changed

+30
-14
lines changed

.travis.yml

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@ os:
33
- linux
44
- osx
55
env:
6-
- ARDUINO_SDK_VERSION=1.6.10
7-
- ARDUINO_SDK_VERSION=1.8.7
6+
global:
7+
- ARDUINO_SDK_BASE_PATH=arduino-sdk/arduino
8+
matrix:
9+
- ARDUINO_SDK_VERSION=1.6.10
10+
- ARDUINO_SDK_VERSION=1.8.7
11+
cache:
12+
directories:
13+
- $HOME/$ARDUINO_SDK_BASE_PATH-$ARDUINO_SDK_VERSION
14+
if: branch != feature/appveyor-ci
815
addons:
916
apt:
1017
packages:
@@ -13,23 +20,32 @@ addons:
1320
- avrdude
1421
- cmake
1522
before_install:
23+
- sdk_path="$HOME/$ARDUINO_SDK_BASE_PATH-$ARDUINO_SDK_VERSION"
24+
- mkdir -p "$sdk_path"
25+
- cd "$sdk_path/../.." # Get one level above 'arduino-sdk'
1626
- |
17-
if [[ $TRAVIS_OS_NAME == linux ]]; then
18-
export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-linux64.tar.xz"
19-
else
20-
export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-macosx.zip"
27+
if [[ -z "$(ls -A "$sdk_path")" ]];
28+
then
29+
if [[ $TRAVIS_OS_NAME == linux ]]; then
30+
sdk_file="arduino-$ARDUINO_SDK_VERSION-linux64.tar.xz"
31+
else
32+
sdk_file="arduino-$ARDUINO_SDK_VERSION-macosx.zip"
33+
fi
34+
wget "https://downloads.arduino.cc/$sdk_file" -O "$sdk_file"
35+
if [[ $TRAVIS_OS_NAME == linux ]]; then
36+
tar -xf "$sdk_file" -C arduino-sdk
37+
else
38+
unzip -q "$sdk_file"
39+
mv Arduino.app/* arduino-sdk/arduino-$ARDUINO_SDK_VERSION
40+
fi
2141
fi
22-
- wget "https://downloads.arduino.cc/$ARDUINO_SDK_FILE" -O "$ARDUINO_SDK_FILE"
23-
- mkdir arduino-sdk
2442
- |
25-
if [[ $TRAVIS_OS_NAME == linux ]]; then
26-
tar xf "$ARDUINO_SDK_FILE" -C arduino-sdk --strip-components 1
27-
export ARDUINO_SDK_PATH="$PWD/arduino-sdk"
28-
else
29-
unzip "$ARDUINO_SDK_FILE" "Arduino.app/Contents/Java/*" -d arduino-sdk
30-
export ARDUINO_SDK_PATH="$(pwd)/arduino-sdk/Arduino.app/Contents/Java"
43+
if [[ $TRAVIS_OS_NAME == osx ]]; then
44+
sdk_path="$sdk_path/Contents/Java"
3145
fi
46+
- export ARDUINO_SDK_PATH="$sdk_path"
3247
install:
48+
- cd "$TRAVIS_BUILD_DIR"
3349
- mkdir build
3450
- rm -rf build/*
3551
- cd build/

0 commit comments

Comments
 (0)