Skip to content

Commit 8efa73c

Browse files
Attempt to update ESP32 CI build process
Manually implement the GH scripts that are now used in the ESP32 repo, overriding the shared method we used to use between the 8266 and 32.
1 parent 1d6186b commit 8efa73c

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

tests/common.sh

+16-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function build_sketches()
4242
local build_arg=$3
4343
local build_dir=build.tmp
4444
mkdir -p $build_dir
45-
local build_cmd="python $arduino/$BUILD_PY -p $PWD/$build_dir $build_arg "
45+
local build_cmd="python3 $arduino/$BUILD_PY -p $PWD/$build_dir $build_arg "
4646
local sketches=$(find $srcpath -name *.ino)
4747
print_size_info >size.log
4848
export ARDUINO_IDE_PATH=$arduino
@@ -92,7 +92,6 @@ function install_libraries()
9292
function install_ide()
9393
{
9494
local ide_path=$1
95-
local core_path=$2
9695
wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
9796
tar xf arduino.tar.xz
9897
mv arduino-nightly $ide_path
@@ -103,7 +102,7 @@ function install_ide()
103102
pushd esp8266/tools
104103
git submodule init
105104
git submodule update
106-
python get.py
105+
python3 get.py
107106
export PATH="$ide_path:$ide_path/hardware/esp8266com/esp8266/tools/xtensa-lx106-elf/bin:$PATH"
108107
popd
109108
cd ..
@@ -113,7 +112,7 @@ function install_ide()
113112
pushd esp32/tools
114113
git submodule init
115114
git submodule update
116-
python get.py
115+
python3 get.py
117116
export PATH="$ide_path:$ide_path/hardware/espressif/esp32/tools/xtensa-esp32-elf/bin:$PATH"
118117
popd
119118
}
@@ -160,9 +159,20 @@ if [ "$BUILD_TYPE" = "build" ]; then
160159
install_arduino
161160
build_sketches_with_arduino
162161
elif [ "$BUILD_TYPE" = "build_esp32" ]; then
163-
export BUILD_PY="hardware/espressif/esp32/tools/build.py -b esp32 -v -k "
162+
#export BUILD_PY="hardware/espressif/esp32/tools/build.py -b esp32 -v -k "
163+
#install_arduino
164+
#build_sketches_with_arduino
165+
sudo apt-get upgrade python
166+
sudo pip install --upgrade pip
167+
sudo pip install --upgrade 'urllib3[secure]'
168+
export ide_path=$HOME/arduino_ide
164169
install_arduino
165-
build_sketches_with_arduino
170+
export FQBN="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
171+
export GITHUB_WORKSPACE="$TRAVIS_BUILD_DIR"
172+
export GITHUB_REPOSITORY="$TRAVIS_REPO_SLUG"
173+
source $ide_path/hardware/espressif/esp32/.github/scripts/install-arduino-ide.sh
174+
source $ide_path/hardware/espressif/esp32/.github/scripts/install-arduino-core-esp32.sh
175+
build_sketches "$FQBN" "$HOME/Arduino/libraries" 0 1
166176
elif [ "$BUILD_TYPE" = "host_tests" ]; then
167177
# Run host side tests
168178
cd $TRAVIS_BUILD_DIR/tests

0 commit comments

Comments
 (0)