8000 Fix CI · Compy/ESPAsyncWebServer@f2a0213 · GitHub
[go: up one dir, main page]
Skip to content

Commit f2a0213

Browse files
agnersagners
committed
Fix CI
1 parent <
10000
a class="color-fg-default Link--inTextBlock prc-Link-Link-85e08" data-hotkey="p" data-hovercard-url="/Compy/ESPAsyncWebServer/commit/e796381a53a5f4bba3194d1e340a1ef1a15df581/hovercard" href="/Compy/ESPAsyncWebServer/commit/e796381a53a5f4bba3194d1e340a1ef1a15df581" data-discover="true">e796381 commit f2a0213

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

‎.github/scripts/install-arduino-core-esp32.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
88
cd "$ARDUINO_USR_PATH/hardware/espressif"
99

1010
echo "Installing Python Serial ..."
11-
pip install pyserial > /dev/null
11+
pip3 install pyserial > /dev/null
1212

1313
if [ "$OS_IS_WINDOWS" == "1" ]; then
1414
echo "Installing Python Requests ..."
15-
pip install requests > /dev/null
15+
pip3 install requests > /dev/null
1616
fi
1717

1818
if [ "$GITHUB_REPOSITORY" == "espressif/arduino-esp32" ]; then
@@ -28,7 +28,7 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
2828
git submodule update --init --recursive > /dev/null 2>&1
2929

3030
echo "Installing Platform Tools ..."
31-
cd tools && python get.py
31+
cd tools && python3 get.py
3232
cd $script_init_path
3333

3434
echo "ESP32 Arduino has been installed in '$ARDUINO_ESP32_PATH'"

‎.github/scripts/install-arduino-core-esp8266.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ mkdir -p "$ARDUINO_USR_PATH/hardware/esp8266com"
66
cd "$ARDUINO_USR_PATH/hardware/esp8266com"
77

88
echo "Installing Python Serial ..."
9-
pip install pyserial > /dev/null
9+
pip3 install pyserial > /dev/null
1010

1111
if [ "$OS_IS_WINDOWS" == "1" ]; then
1212
echo "Installing Python Requests ..."
13-
pip install requests > /dev/null
13+
pip3 install requests > /dev/null
1414
fi
1515

1616
echo "Cloning Core Repository ..."
@@ -22,7 +22,7 @@ git submodule update --init --recursive > /dev/null 2>&1
2222

2323
echo "Installing Platform Tools ..."
2424
cd tools
25-
python get.py > /dev/null
25+
python3 get.py > /dev/null
2626
cd $script_init_path
2727

2828
echo "ESP8266 Arduino has been installed in '$ARDUINO_USR_PATH/hardware/esp8266com'"

‎.github/scripts/install-platformio.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
22

33
echo "Installing Python Wheel ..."
4-
pip install wheel > /dev/null 2>&1
4+
pip3 install wheel > /dev/null 2>&1
55

66
echo "Installing PlatformIO ..."
7-
pip install -U platformio > /dev/null 2>&1
7+
pip3 install -U platformio > /dev/null 2>&1
88

99
echo "PlatformIO has been installed"
1010
echo ""
@@ -23,7 +23,7 @@ function build_pio_sketch(){ # build_pio_sketch <board> <path-to-ino> <build-fla
2323
local sketch_dir=$(dirname "$sketch")
2424
echo ""
2525
echo "Compiling '"$(basename "$sketch")"' ..."
26-
python -m platformio ci -l '.' --board "$board" "$sketch_dir" --project-option="board_build.partitions = huge_app.csv" --project-option="build_flags=$buildFlags"
26+
python3 -m platformio ci -l '.' --board "$board" "$sketch_dir" --project-option="board_build.partitions = huge_app.csv" --project-option="build_flags=$buildFlags"
2727
}
2828

2929
function count_sketches() # count_sketches <examples-path>

‎.github/scripts/on-push.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
3131
source ./.github/scripts/install-arduino-ide.sh
3232

3333
echo "Installing ESPAsyncWebServer ..."
34-
cp -rf "$GITHUB_WORKSPACE" "$ARDUINO_USR_PATH/libraries/ESPAsyncWebServer"
34+
cp -af "$GITHUB_WORKSPACE/src" "$ARDUINO_USR_PATH/libraries/ESPAsyncWebServer"
3535
echo "Installing ArduinoJson ..."
3636
git clone https://github.com/bblanchon/ArduinoJson "$ARDUINO_USR_PATH/libraries/ArduinoJson" > /dev/null 2>&1
3737

@@ -53,18 +53,18 @@ else
5353
# PlatformIO Test
5454
source ./.github/scripts/install-platformio.sh
5555

56-
python -m platformio lib --storage-dir "$GITHUB_WORKSPACE" install
56+
python3 -m platformio lib --storage-dir "$GITHUB_WORKSPACE" install
5757
echo "Installing ArduinoJson ..."
58-
python -m platformio lib -g install https://github.com/bblanchon/ArduinoJson.git > /dev/null 2>&1
58+
python3 -m platformio lib -g install https://github.com/bblanchon/ArduinoJson.git > /dev/null 2>&1
5959
if [[ "$TARGET_PLATFORM" == "esp32" ]]; then
6060
BOARD="esp32dev"
6161
echo "Installing AsyncTCP ..."
62-
python -m platformio lib -g install https://github.com/me-no-dev/AsyncTCP.git > /dev/null 2>&1
62+
python3 -m platformio lib -g install https://github.com/me-no-dev/AsyncTCP.git > /dev/null 2>&1
6363
echo "BUILDING ESP32 EXAMPLES"
6464
else
6565
BOARD="esp12e"
6666
echo "Installing ESPAsyncTCP ..."
67-
python -m platformio lib -g install https://github.com/me-no-dev/ESPAsyncTCP.git > /dev/null 2>&1
67+
python3 -m platformio lib -g install https://github.com/me-no-dev/ESPAsyncTCP.git > /dev/null 2>&1
6868
echo "BUILDING ESP8266 EXAMPLES"
6969
fi
7070
build_pio_sketches "$BOARD" "$GITHUB_WORKSPACE/examples"

0 commit comments

Comments
 (0)
0