Skip to content

Commit 4e069bd

Browse files
authored
Merge pull request espressif#96 from adafruit/travfix
Travfix
2 parents a688e13 + f49b8e3 commit 4e069bd

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

.travis.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
language: c
2-
sudo: false
1+
language: python
2+
3+
dist: focal
4+
35
cache:
46
directories:
57
- ~/arduino_ide
@@ -8,14 +10,8 @@ git:
810
depth: false
911
quiet: true
1012

11-
addons:
12-
apt:
13-
packages:
14-
- python3
15-
- python3-pip
1613

1714
before_install:
18-
- travis_wait 30 mvn install
1915
- source $TRAVIS_BUILD_DIR/install.sh
2016

2117
script:

install.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ INSTALL_NRF52=$([[ $INSTALL_PLATFORMS == *"nrf52"* || -z "$INSTALL_PLATFORMS" ]]
109109

110110
if [[ $INSTALL_ESP32 == 1 ]]; then
111111
echo -n "ESP32: "
112+
pip install pyserial
112113
DEPENDENCY_OUTPUT=$(arduino --install-boards esp32:esp32 2>&1)
113114
if [ $? -ne 0 ]; then echo -e "\xe2\x9c\x96 OR CACHED"; else echo -e """$GREEN""\xe2\x9c\x93"; fi
114115
fi
@@ -139,12 +140,10 @@ fi
139140

140141
if [[ $INSTALL_NRF52 == 1 ]]; then
141142
echo -n "ADAFRUIT NRF5X: "
142-
pip3 install --user setuptools
143-
pip3 install --user adafruit-nrfutil
144-
pip3 install --user pyserial
145-
sudo pip3 install setuptools
146-
sudo pip3 install adafruit-nrfutil
147-
sudo pip3 install pyserial
143+
pip install wheel
144+
pip install setuptools
145+
pip install adafruit-nrfutil
146+
pip install pyserial
148147
DEPENDENCY_OUTPUT=$(arduino --install-boards adafruit:nrf52 2>&1)
149148
if [ $? -ne 0 ]; then echo -e "\xe2\x9c\x96 OR CACHED"; else echo -e """$GREEN""\xe2\x9c\x93"; fi
150149
fi
@@ -169,7 +168,7 @@ export SKIP_COUNT=0
169168
export FAIL_COUNT=0
170169
export PDE_COUNT=0
171170
# close if [[ $# -eq 0 ]] ; then
172-
fi
171+
fi
173172
# build all of the examples for the passed platform
174173
#Sourcing and defining functions
175174
function build_platform()

0 commit comments

Comments
 (0)