diff --git a/.github/scripts/install-arduino-core-esp32.sh b/.github/scripts/install-arduino-core-esp32.sh index cf1026d6a..3fb4203c5 100755 --- a/.github/scripts/install-arduino-core-esp32.sh +++ b/.github/scripts/install-arduino-core-esp32.sh @@ -8,11 +8,11 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then cd "$ARDUINO_USR_PATH/hardware/espressif" echo "Installing Python Serial ..." - pip install pyserial > /dev/null + pip3 install pyserial > /dev/null if [ "$OS_IS_WINDOWS" == "1" ]; then echo "Installing Python Requests ..." - pip install requests > /dev/null + pip3 install requests > /dev/null fi if [ "$GITHUB_REPOSITORY" == "espressif/arduino-esp32" ]; then @@ -28,7 +28,7 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then git submodule update --init --recursive > /dev/null 2>&1 echo "Installing Platform Tools ..." - cd tools && python get.py + cd tools && python3 get.py cd $script_init_path echo "ESP32 Arduino has been installed in '$ARDUINO_ESP32_PATH'" diff --git a/.github/scripts/install-arduino-core-esp8266.sh b/.github/scripts/install-arduino-core-esp8266.sh index 048cd0246..db9d56ca7 100644 --- a/.github/scripts/install-arduino-core-esp8266.sh +++ b/.github/scripts/install-arduino-core-esp8266.sh @@ -6,11 +6,11 @@ mkdir -p "$ARDUINO_USR_PATH/hardware/esp8266com" cd "$ARDUINO_USR_PATH/hardware/esp8266com" echo "Installing Python Serial ..." -pip install pyserial > /dev/null +pip3 install pyserial > /dev/null if [ "$OS_IS_WINDOWS" == "1" ]; then echo "Installing Python Requests ..." - pip install requests > /dev/null + pip3 install requests > /dev/null fi echo "Cloning Core Repository ..." @@ -22,7 +22,7 @@ git submodule update --init --recursive > /dev/null 2>&1 echo "Installing Platform Tools ..." cd tools -python get.py > /dev/null +python3 get.py > /dev/null cd $script_init_path echo "ESP8266 Arduino has been installed in '$ARDUINO_USR_PATH/hardware/esp8266com'" diff --git a/.github/scripts/install-platformio.sh b/.github/scripts/install-platformio.sh index 594948ea4..35b5f2de1 100644 --- a/.github/scripts/install-platformio.sh +++ b/.github/scripts/install-platformio.sh @@ -1,10 +1,10 @@ #!/bin/bash echo "Installing Python Wheel ..." -pip install wheel > /dev/null 2>&1 +pip3 install wheel > /dev/null 2>&1 echo "Installing PlatformIO ..." -pip install -U platformio > /dev/null 2>&1 +pip3 install -U platformio > /dev/null 2>&1 echo "PlatformIO has been installed" echo "" @@ -23,7 +23,7 @@ function build_pio_sketch(){ # build_pio_sketch diff --git a/.github/scripts/on-push.sh b/.github/scripts/on-push.sh index 96fff573e..12a73a289 100755 --- a/.github/scripts/on-push.sh +++ b/.github/scripts/on-push.sh @@ -31,7 +31,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then source ./.github/scripts/install-arduino-ide.sh echo "Installing ESPAsyncWebServer ..." - cp -rf "$GITHUB_WORKSPACE" "$ARDUINO_USR_PATH/libraries/ESPAsyncWebServer" + cp -af "$GITHUB_WORKSPACE/src" "$ARDUINO_USR_PATH/libraries/ESPAsyncWebServer" echo "Installing ArduinoJson ..." git clone https://github.com/bblanchon/ArduinoJson "$ARDUINO_USR_PATH/libraries/ArduinoJson" > /dev/null 2>&1 @@ -53,18 +53,18 @@ else # PlatformIO Test source ./.github/scripts/install-platformio.sh - python -m platformio lib --storage-dir "$GITHUB_WORKSPACE" install + python3 -m platformio lib --storage-dir "$GITHUB_WORKSPACE" install echo "Installing ArduinoJson ..." - python -m platformio lib -g install https://github.com/bblanchon/ArduinoJson.git > /dev/null 2>&1 + python3 -m platformio lib -g install https://github.com/bblanchon/ArduinoJson.git > /dev/null 2>&1 if [[ "$TARGET_PLATFORM" == "esp32" ]]; then BOARD="esp32dev" echo "Installing AsyncTCP ..." - python -m platformio lib -g install https://github.com/me-no-dev/AsyncTCP.git > /dev/null 2>&1 + python3 -m platformio lib -g install https://github.com/me-no-dev/AsyncTCP.git > /dev/null 2>&1 echo "BUILDING ESP32 EXAMPLES" else BOARD="esp12e" echo "Installing ESPAsyncTCP ..." - python -m platformio lib -g install https://github.com/me-no-dev/ESPAsyncTCP.git > /dev/null 2>&1 + python3 -m platformio lib -g install https://github.com/me-no-dev/ESPAsyncTCP.git > /dev/null 2>&1 echo "BUILDING ESP8266 EXAMPLES" fi build_pio_sketches "$BOARD" "$GITHUB_WORKSPACE/examples"