Merge pull request #10708 from espressif/ci/remove_pio_tests

Co-authored-by: Rodrigo Garcia <rodrigo.garcia@espressif.com>
espressif · Dec 11, 2024 · 7e908be · 7e908be
2 parents bfc45db + 45d8630
commit 7e908be
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 273 deletions.
diff --git a/.github/scripts/install-platformio-esp32.sh b/.github/scripts/install-platformio-esp32.sh
diff --git a/.github/scripts/on-push.sh b/.github/scripts/on-push.sh
@@ -55,14 +55,11 @@ CHUNK_INDEX=$1
 CHUNKS_CNT=$2
 BUILD_LOG=$3
 SKETCHES_FILE=$4
-BUILD_PIO=0
 if [ "$#" -lt 2 ] || [ "$CHUNKS_CNT" -le 0 ]; then
     CHUNK_INDEX=0
     CHUNKS_CNT=1
 elif [ "$CHUNK_INDEX" -gt "$CHUNKS_CNT" ] &&  [ "$CHUNKS_CNT" -ge 2 ]; then
     CHUNK_INDEX=$CHUNKS_CNT
-elif [ "$CHUNK_INDEX" -eq "$CHUNKS_CNT" ]; then
-    BUILD_PIO=1
 fi
 
 if [ -z "$BUILD_LOG" ] || [ "$BUILD_LOG" -le 0 ]; then
@@ -73,54 +70,35 @@ fi
 #git -C "$GITHUB_WORKSPACE" submodule update --init --recursive > /dev/null 2>&1
 
 SCRIPTS_DIR="./.github/scripts"
-if [ "$BUILD_PIO" -eq 0 ]; then
-    source "${SCRIPTS_DIR}/install-arduino-cli.sh"
-    source "${SCRIPTS_DIR}/install-arduino-core-esp32.sh"
-
-    SKETCHES_ESP32=(
-        "$ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
-        "$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino"
-        "$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
-        "$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino"
-    )
-    #create sizes_file
-    sizes_file="$GITHUB_WORKSPACE/cli_compile_$CHUNK_INDEX.json"
-
-    if [ "$BUILD_LOG" -eq 1 ]; then
-        #create sizes_file and echo start of JSON array with "boards" key
-        echo "{\"boards\": [" > "$sizes_file"
-    fi
-
-    #build sketches for different targets
-    build "esp32p4" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
-    build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
-    build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
-    build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
-    build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
-    build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
-    build "esp32"   "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
-
-    if [ "$BUILD_LOG" -eq 1 ]; then
-        #remove last comma from the last JSON object
-        sed -i '$ s/,$//' "$sizes_file"
-        #echo end of JSON array
-        echo "]}" >> "$sizes_file"
-    fi
-else
-    source "${SCRIPTS_DIR}/install-platformio-esp32.sh"
-    # PlatformIO ESP32 Test
-    BOARD="esp32dev"
-    OPTIONS="board_build.partitions = huge_app.csv"
-    build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
-    build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
-    build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
-    build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino" && \
-    build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
-
-    # Basic sanity testing for other series
-    for board in "esp32-c3-devkitm-1" "esp32-s2-saola-1" "esp32-s3-devkitc-1"; do
-        python -m platformio ci --board "$board" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.partitions = huge_app.csv"
-    done
+source "${SCRIPTS_DIR}/install-arduino-cli.sh"
+source "${SCRIPTS_DIR}/install-arduino-core-esp32.sh"
+
+SKETCHES_ESP32=(
+    "$ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
+    "$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino"
+    "$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
+    "$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino"
+)
+#create sizes_file
+sizes_file="$GITHUB_WORKSPACE/cli_compile_$CHUNK_INDEX.json"
+
+if [ "$BUILD_LOG" -eq 1 ]; then
+    #create sizes_file and echo start of JSON array with "boards" key
+    echo "{\"boards\": [" > "$sizes_file"
+fi
 
-    #build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
+#build sketches for different targets
+build "esp32p4" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
+build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
+build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
+build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
+build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
+build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
+build "esp32"   "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
+
+if [ "$BUILD_LOG" -eq 1 ]; then
+    #remove last comma from the last JSON object
+    sed -i '$ s/,$//' "$sizes_file"
+    #echo end of JSON array
+    echo "]}" >> "$sizes_file"
 fi
diff --git a/.github/scripts/on-release.sh b/.github/scripts/on-release.sh
@@ -239,7 +239,7 @@ cp -f  "$GITHUB_WORKSPACE/tools/gen_insights_package.py"    "$PKG_DIR/tools/"
 cp -f  "$GITHUB_WORKSPACE/tools/gen_insights_package.exe"   "$PKG_DIR/tools/"
 cp -Rf "$GITHUB_WORKSPACE/tools/partitions"                 "$PKG_DIR/tools/"
 cp -Rf "$GITHUB_WORKSPACE/tools/ide-debug"                  "$PKG_DIR/tools/"
-cp -f  "$GITHUB_WORKSPACE/tools/platformio-build.py"        "$PKG_DIR/tools/"
+cp -f  "$GITHUB_WORKSPACE/tools/pioarduino-build.py"        "$PKG_DIR/tools/"
 
 # Remove unnecessary files in the package folder
 echo "Cleaning up folders ..."

diff --git a/.github/scripts/set_push_chunks.sh b/.github/scripts/set_push_chunks.sh
@@ -79,7 +79,6 @@ chunks+="]"
     echo "build_libraries=$BUILD_LIBRARIES"
     echo "build_static_sketches=$BUILD_STATIC_SKETCHES"
     echo "build_idf=$BUILD_IDF"
-    echo "build_platformio=$BUILD_PLATFORMIO"
     echo "chunk_count=$chunks_count"
     echo "chunks=$chunks"
 } >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -61,7 +61,6 @@ jobs:
       build_libraries: ${{ steps.set-chunks.outputs.build_libraries }}
       build_static_sketches: ${{ steps.set-chunks.outputs.build_static_sketches }}
       build_idf: ${{ steps.set-chunks.outputs.build_idf }}
-      build_platformio: ${{ steps.set-chunks.outputs.build_platformio }}
       chunk_count: ${{ steps.set-chunks.outputs.chunk_count }}
       chunks: ${{ steps.set-chunks.outputs.chunks }}
     steps:
@@ -77,11 +76,9 @@ jobs:
           files_yaml: |
             core:
               - '.github/**'
-              - '!.github/scripts/install-platformio-esp32.sh'
               - 'cores/**'
               - 'package/**'
               - 'tools/**'
-              - '!tools/platformio-build.py'
               - 'platform.txt'
               - 'programmers.txt'
               - "variants/esp32/**/*"
@@ -110,18 +107,13 @@ jobs:
               - 'Kconfig.projbuild'
               - 'CMakeLists.txt'
               - "variants/esp32c2/**/*"
-            platformio:
-              - 'package.json'
-              - '.github/scripts/install-platformio-esp32.sh'
-              - 'tools/platformio-build.py'
 
       - name: Set chunks
         id: set-chunks
         env:
           LIB_FILES: ${{ steps.changed-files.outputs.libraries_all_changed_files }}
           IS_PR: ${{ github.event_name == 'pull_request' }}
           MAX_CHUNKS: ${{ env.MAX_CHUNKS }}
-          BUILD_PLATFORMIO: ${{ steps.changed-files.outputs.platformio_any_changed == 'true' }}
           BUILD_IDF: ${{ steps.changed-files.outputs.idf_any_changed == 'true' }}
           BUILD_LIBRARIES: ${{ steps.changed-files.outputs.libraries_any_changed == 'true' }}
           BUILD_STATIC_SKETCHES: ${{ steps.changed-files.outputs.static_sketeches_any_changed == 'true' }}
@@ -212,28 +204,6 @@ jobs:
       - name: Build Sketches
         run: bash ./.github/scripts/on-push.sh
 
-  # # PlatformIO on Windows, Ubuntu and Mac
-  # build-platformio:
-  #   name: PlatformIO on ${{ matrix.os }}
-  #   needs: gen-chunks
-  #   if: |
-  #     needs.gen-chunks.outputs.build_all == 'true' ||
-  #     needs.gen-chunks.outputs.build_static_sketches == 'true' ||
-  #     needs.gen-chunks.outputs.build_platformio == 'true'
-  #   runs-on: ${{ matrix.os }}
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       os: [ubuntu-latest, windows-latest, macOS-latest]
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: actions/setup-python@v5
-  #       with:
-  #         python-version: "3.x"
-  #     - name: Build Sketches
-  #       run: bash ./.github/scripts/on-push.sh 1 1 #equal and non-zero to trigger PIO
-
-  # ESP-IDF component build
   build-esp-idf-component:
     name: Build with ESP-IDF ${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
     needs: gen-chunks

diff --git a/platform.txt b/platform.txt
@@ -44,7 +44,7 @@ compiler.warning_flags.more=-Wall
 compiler.warning_flags.all=-Wall -Wextra
 
 # Additional flags specific to Arduino (not based on IDF flags).
-# Update tools/platformio-build.py when changing these flags.
+# Update tools/pioarduino-build.py when changing these flags.
 compiler.common_werror_flags=-Werror=return-type
 
 # Compile Flags

diff --git a/tools/platformio-build.py → tools/pioarduino-build.py b/tools/platformio-build.py → tools/pioarduino-build.py
@@ -22,7 +22,7 @@
 http://arduino.cc/en/Reference/HomePage
 """
 
-# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
+# Extends: https://github.com/pioarduino/platform-espressif32/blob/develop/builder/main.py
 
 from os.path import abspath, basename, isdir, isfile, join
 from copy import deepcopy
@@ -160,7 +160,7 @@ def add_tinyuf2_extra_image():
     join(
         FRAMEWORK_LIBS_DIR,
         build_mcu,
-        "platformio-build.py",
+        "pioarduino-build.py",
     )
 )