Skip to content

Commit 7e908be

Browse files
me-no-devSuGlider
me-no-dev
and
SuGlider
authored
Merge pull request espressif#10708 from espressif/ci/remove_pio_tests
Co-authored-by: Rodrigo Garcia <rodrigo.garcia@espressif.com>
2 parents bfc45db + 45d8630 commit 7e908be

File tree

7 files changed

+34
-273
lines changed

7 files changed

+34
-273
lines changed

‎.github/scripts/install-platformio-esp32.sh‎

Lines changed: 0 additions & 186 deletions
This file was deleted.

‎.github/scripts/on-push.sh‎

Lines changed: 30 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,11 @@ CHUNK_INDEX=$1
5555
CHUNKS_CNT=$2
5656
BUILD_LOG=$3
5757
SKETCHES_FILE=$4
58-
BUILD_PIO=0
5958
if [ "$#" -lt 2 ] || [ "$CHUNKS_CNT" -le 0 ]; then
6059
CHUNK_INDEX=0
6160
CHUNKS_CNT=1
6261
elif [ "$CHUNK_INDEX" -gt "$CHUNKS_CNT" ] && [ "$CHUNKS_CNT" -ge 2 ]; then
6362
CHUNK_INDEX=$CHUNKS_CNT
64-
elif [ "$CHUNK_INDEX" -eq "$CHUNKS_CNT" ]; then
65-
BUILD_PIO=1
6663
fi
6764

6865
if [ -z "$BUILD_LOG" ] || [ "$BUILD_LOG" -le 0 ]; then
@@ -73,54 +70,35 @@ fi
7370
#git -C "$GITHUB_WORKSPACE" submodule update --init --recursive > /dev/null 2>&1
7471

7572
SCRIPTS_DIR="./.github/scripts"
76-
if [ "$BUILD_PIO" -eq 0 ]; then
77-
source "${SCRIPTS_DIR}/install-arduino-cli.sh"
78-
source "${SCRIPTS_DIR}/install-arduino-core-esp32.sh"
79-
80-
SKETCHES_ESP32=(
81-
"$ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
82-
"$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino"
83-
"$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
84-
"$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino"
85-
)
86-
#create sizes_file
87-
sizes_file="$GITHUB_WORKSPACE/cli_compile_$CHUNK_INDEX.json"
88-
89-
if [ "$BUILD_LOG" -eq 1 ]; then
90-
#create sizes_file and echo start of JSON array with "boards" key
91-
echo "{\"boards\": [" > "$sizes_file"
92-
fi
93-
94-
#build sketches for different targets
95-
build "esp32p4" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
96-
build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
97-
build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
98-
build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
99-
build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
100-
build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
101-
build "esp32" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
102-
103-
if [ "$BUILD_LOG" -eq 1 ]; then
104-
#remove last comma from the last JSON object
105-
sed -i '$ s/,$//' "$sizes_file"
106-
#echo end of JSON array
107-
echo "]}" >> "$sizes_file"
108-
fi
109-
else
110-
source "${SCRIPTS_DIR}/install-platformio-esp32.sh"
111-
# PlatformIO ESP32 Test
112-
BOARD="esp32dev"
113-
OPTIONS="board_build.partitions = huge_app.csv"
114-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
115-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
116-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
117-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino" && \
118-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
119-
120-
# Basic sanity testing for other series
121-
for board in "esp32-c3-devkitm-1" "esp32-s2-saola-1" "esp32-s3-devkitc-1"; do
122-
python -m platformio ci --board "$board" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.partitions = huge_app.csv"
123-
done
73+
source "${SCRIPTS_DIR}/install-arduino-cli.sh"
74+
source "${SCRIPTS_DIR}/install-arduino-core-esp32.sh"
75+
76+
SKETCHES_ESP32=(
77+
"$ARDUINO_ESP32_PATH/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
78+
"$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino"
79+
"$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
80+
"$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino"
81+
)
82+
#create sizes_file
83+
sizes_file="$GITHUB_WORKSPACE/cli_compile_$CHUNK_INDEX.json"
84+
85+
if [ "$BUILD_LOG" -eq 1 ]; then
86+
#create sizes_file and echo start of JSON array with "boards" key
87+
echo "{\"boards\": [" > "$sizes_file"
88+
fi
12489

125-
#build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
90+
#build sketches for different targets
91+
build "esp32p4" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
92+
build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
93+
build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
94+
build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
95+
build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
96+
build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
97+
build "esp32" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
98+
99+
if [ "$BUILD_LOG" -eq 1 ]; then
100+
#remove last comma from the last JSON object
101+
sed -i '$ s/,$//' "$sizes_file"
102+
#echo end of JSON array
103+
echo "]}" >> "$sizes_file"
126104
fi

‎.github/scripts/on-release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ cp -f "$GITHUB_WORKSPACE/tools/gen_insights_package.py" "$PKG_DIR/tools/"
239239
cp -f "$GITHUB_WORKSPACE/tools/gen_insights_package.exe" "$PKG_DIR/tools/"
240240
cp -Rf "$GITHUB_WORKSPACE/tools/partitions" "$PKG_DIR/tools/"
241241
cp -Rf "$GITHUB_WORKSPACE/tools/ide-debug" "$PKG_DIR/tools/"
242-
cp -f "$GITHUB_WORKSPACE/tools/platformio-build.py" "$PKG_DIR/tools/"
242+
cp -f "$GITHUB_WORKSPACE/tools/pioarduino-build.py" "$PKG_DIR/tools/"
243243

244244
# Remove unnecessary files in the package folder
245245
echo "Cleaning up folders ..."

‎.github/scripts/set_push_chunks.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ chunks+="]"
7979
echo "build_libraries=$BUILD_LIBRARIES"
8080
echo "build_static_sketches=$BUILD_STATIC_SKETCHES"
8181
echo "build_idf=$BUILD_IDF"
82-
echo "build_platformio=$BUILD_PLATFORMIO"
8382
echo "chunk_count=$chunks_count"
8483
echo "chunks=$chunks"
8584
} >> "$GITHUB_OUTPUT"

‎.github/workflows/push.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
build_libraries: ${{ steps.set-chunks.outputs.build_libraries }}
6262
build_static_sketches: ${{ steps.set-chunks.outputs.build_static_sketches }}
6363
build_idf: ${{ steps.set-chunks.outputs.build_idf }}
64-
build_platformio: ${{ steps.set-chunks.outputs.build_platformio }}
6564
chunk_count: ${{ steps.set-chunks.outputs.chunk_count }}
6665
chunks: ${{ steps.set-chunks.outputs.chunks }}
6766
steps:
@@ -77,11 +76,9 @@ jobs:
7776
files_yaml: |
7877
core:
7978
- '.github/**'
80-
- '!.github/scripts/install-platformio-esp32.sh'
8179
- 'cores/**'
8280
- 'package/**'
8381
- 'tools/**'
84-
- '!tools/platformio-build.py'
8582
- 'platform.txt'
8683
- 'programmers.txt'
8784
- "variants/esp32/**/*"
@@ -110,18 +107,13 @@ jobs:
110107
- 'Kconfig.projbuild'
111108
- 'CMakeLists.txt'
112109
- "variants/esp32c2/**/*"
113-
platformio:
114-
- 'package.json'
115-
- '.github/scripts/install-platformio-esp32.sh'
116-
- 'tools/platformio-build.py'
117110
118111
- name: Set chunks
119112
id: set-chunks
120113
env:
121114
LIB_FILES: ${{ steps.changed-files.outputs.libraries_all_changed_files }}
122115
IS_PR: ${{ github.event_name == 'pull_request' }}
123116
MAX_CHUNKS: ${{ env.MAX_CHUNKS }}
124-
BUILD_PLATFORMIO: ${{ steps.changed-files.outputs.platformio_any_changed == 'true' }}
125117
BUILD_IDF: ${{ steps.changed-files.outputs.idf_any_changed == 'true' }}
126118
BUILD_LIBRARIES: ${{ steps.changed-files.outputs.libraries_any_changed == 'true' }}
127119
BUILD_STATIC_SKETCHES: ${{ steps.changed-files.outputs.static_sketeches_any_changed == 'true' }}
@@ -212,28 +204,6 @@ jobs:
212204
- name: Build Sketches
213205
run: bash ./.github/scripts/on-push.sh
214206

215-
# # PlatformIO on Windows, Ubuntu and Mac
216-
# build-platformio:
217-
# name: PlatformIO on ${{ matrix.os }}
218-
# needs: gen-chunks
219-
# if: |
220-
# needs.gen-chunks.outputs.build_all == 'true' ||
221-
# needs.gen-chunks.outputs.build_static_sketches == 'true' ||
222-
# needs.gen-chunks.outputs.build_platformio == 'true'
223-
# runs-on: ${{ matrix.os }}
224-
# strategy:
225-
# fail-fast: false
226-
# matrix:
227-
# os: [ubuntu-latest, windows-latest, macOS-latest]
228-
# steps:
229-
# - uses: actions/checkout@v4
230-
# - uses: actions/setup-python@v5
231-
# with:
232-
# python-version: "3.x"
233-
# - name: Build Sketches
234-
# run: bash ./.github/scripts/on-push.sh 1 1 #equal and non-zero to trigger PIO
235-
236-
# ESP-IDF component build
237207
build-esp-idf-component:
238208
name: Build with ESP-IDF ${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
239209
needs: gen-chunks

‎platform.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ compiler.warning_flags.more=-Wall
4444
compiler.warning_flags.all=-Wall -Wextra
4545

4646
# Additional flags specific to Arduino (not based on IDF flags).
47-
# Update tools/platformio-build.py when changing these flags.
47+
# Update tools/pioarduino-build.py when changing these flags.
4848
compiler.common_werror_flags=-Werror=return-type
4949

5050
# Compile Flags

‎tools/platformio-build.py‎ renamed to ‎tools/pioarduino-build.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
http://arduino.cc/en/Reference/HomePage
2323
"""
2424

25-
# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
25+
# Extends: https://github.com/pioarduino/platform-espressif32/blob/develop/builder/main.py
2626

2727
from os.path import abspath, basename, isdir, isfile, join
2828
from copy import deepcopy
@@ -160,7 +160,7 @@ def add_tinyuf2_extra_image():
160160
join(
161161
FRAMEWORK_LIBS_DIR,
162162
build_mcu,
163-
"platformio-build.py",
163+
"pioarduino-build.py",
164164
)
165165
)
166166

0 commit comments

Comments
 (0)