Skip to content

Migrate-s3-boards #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 24, 2025
Merged

Migrate-s3-boards #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
effe76b
Switch 4MB S3 boards to esptool job
tyeth Jul 22, 2025
6a98837
Reorder targets in esptool job by chip then alpha
tyeth Jul 22, 2025
81f43d5
Remove bootloader offsets as now in tinyuf2 flash_args file
tyeth Jul 22, 2025
d8595b2
Update version to 1.0.0-beta.109
tyeth Jul 22, 2025
c7c007b
Provide more info if tinyuf2 release fetch failure
tyeth Jul 22, 2025
00ca019
Make curl fail properly with bad http status codes
tyeth Jul 22, 2025
ca3d5c7
Add error catching to tinyuf2 steps
tyeth Jul 23, 2025
4dd956e
Adjust sleep retry to be >60s with fuzz
tyeth Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 37 additions & 33 deletions .github/workflows/build-clang-doxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,19 @@ jobs:
arduino-platform:
[
"feather_esp32s2",
"feather_esp32s2_reverse_tft",
"feather_esp32s2_tft",
"funhouse_noota",
"esp32s3_devkitc_1_n8",
"xiao_esp32s3",
"magtag",
"metroesp32s2",
"feather_esp32s2_tft",
"feather_esp32s2_reverse_tft",
"qtpy_esp32s2",
"esp32s3_devkitc_1_n8",
"feather_esp32s3_4mbflash_2mbpsram",
"feather_esp32s3_reverse_tft",
"feather_esp32s3_tft",
"qtpy_esp32s3_n4r2",
"xiao_esp32s3",
]
# include:
# - offset: "0x0"
# - offset: "0x1000"
# arduino-platform: "funhouse_noota"
# - offset: "0x1000"
# arduino-platform: "feather_esp32s2"
# - offset: "0x1000"
# arduino-platform: "metroesp32s2"
# - offset: "0x1000"
# arduino-platform: "magtag"
# - offset: "0x1000"
# arduino-platform: "feather_esp32s2_tft"
# - offset: "0x1000"
# arduino-platform: "feather_esp32s2_reverse_tft"
# - offset: "0x1000"
# arduino-platform: "qtpy_esp32s2"

steps:
- name: "skip if unwanted"
Expand Down Expand Up @@ -163,15 +151,35 @@ jobs:
} >> "$GITHUB_OUTPUT"
- name: fetch tinyuf2 combined.bin
run: |
DOWNLOAD_URL=$(curl -s https://api.github.com/repos/adafruit/tinyuf2/releases/latest | \
jq -r '.assets[] | select(.browser_download_url | contains("tinyuf2-'${{fromJson(steps.get_board_json.outputs.boardJson).bootloaderBoardName}}'-") and endswith(".zip")) | .browser_download_url')
if [ -z "$DOWNLOAD_URL" ]; then
echo "Error: Could not find the latest tinyuf2 release for board ${fromJson(steps.get_board_json.outputs.boardJson).bootloaderBoardName}."
exit 1
fi
wget "$DOWNLOAD_URL" -O tinyuf2.zip
unzip -o tinyuf2.zip -d .

BOARD_NAME="${{fromJson(steps.get_board_json.outputs.boardJson).bootloaderBoardName}}"
set +e
for attempt in 1 2 3; do
echo "Attempt $attempt: Fetching tinyuf2 release info for board $BOARD_NAME"
API_RESPONSE=$(curl --silent --fail https://api.github.com/repos/adafruit/tinyuf2/releases/latest)
if [ $? -ne 0 ]; then
echo "Attempt $attempt: curl failed to fetch release info."
if [ "$attempt" -eq 3 ]; then exit 1; else sleep $((60 + RANDOM % 40)); continue; fi
Comment on lines +156 to +161
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you remove the attempt loop? I'd rather the step fail so we can see what/why/where it failed and manually kick it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it fail often?

fi
DOWNLOAD_URL=$(echo "$API_RESPONSE" | jq -r '.assets[] | select(.browser_download_url | contains("tinyuf2-'$BOARD_NAME'-") and endswith(".zip")) | .browser_download_url // empty'); JQ_EXIT=$?
if [ $JQ_EXIT -ne 0 ] || [ -z "$DOWNLOAD_URL" ]; then
echo "Attempt $attempt: jq failed or no matching zip found."
if [ "$attempt" -eq 3 ]; then exit 1; else sleep $((60 + RANDOM % 40)); continue; fi
fi
echo "Attempt $attempt: Downloading $DOWNLOAD_URL"
wget "$DOWNLOAD_URL" -O tinyuf2.zip
if [ $? -eq 0 ]; then
unzip -o tinyuf2.zip -d .
if [ $? -ne 0 ]; then
echo "Attempt $attempt: unzip failed"
if [ "$attempt" -eq 3 ]; then exit 1; else sleep $((60 + RANDOM % 40)); continue; fi
fi
break
else
echo "Attempt $attempt: wget failed to download $DOWNLOAD_URL"
if [ "$attempt" -eq 3 ]; then exit 1; else sleep $((60 + RANDOM % 40)); fi
fi
done
set -e
- name: move partition and bootloader files for tinyuf2 (to match flash_args)
run: |
# Copy files where they're expected to make flash_args happy
Expand Down Expand Up @@ -248,11 +256,7 @@ jobs:
[
"metro_esp32s3",
"feather_esp32s3",
"feather_esp32s3_4mbflash_2mbpsram",
"feather_esp32s3_reverse_tft",
"feather_esp32s3_tft",
"qtpy_esp32s3",
"qtpy_esp32s3_n4r2",
]
steps:
- name: "skip if unwanted"
Expand Down
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Adafruit WipperSnapper
version=1.0.0-beta.108
version=1.0.0-beta.109
author=Adafruit
maintainer=Adafruit <adafruitio@adafruit.com>
sentence=Arduino application for Adafruit.io WipperSnapper
Expand Down
2 changes: 1 addition & 1 deletion src/Wippersnapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
#endif

#define WS_VERSION \
"1.0.0-beta.108" ///< WipperSnapper app. version (semver-formatted)
"1.0.0-beta.109" ///< WipperSnapper app. version (semver-formatted)

// Reserved Adafruit IO MQTT topics
#define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic
Expand Down
Loading