Skip to content

Commit 3c56608

Browse files
authored
Update license files and top-level README.md, move test binaries to tests/ directory (#734)
* Update license files * Move the test binaries to the tests/ directory * Remove outdated notice from top-level `README.md`
1 parent 9a45e19 commit 3c56608

File tree

14 files changed

+181
-56
lines changed

14 files changed

+181
-56
lines changed

.github/workflows/hil.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
repository:
1010
description: "Owner and repository to test"
1111
required: true
12-
default: 'esp-rs/espflash'
12+
default: "esp-rs/espflash"
1313
branch:
1414
description: "Branch, tag or SHA to checkout."
1515
required: true
@@ -26,7 +26,6 @@ concurrency:
2626
cancel-in-progress: true
2727
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2828

29-
3029
jobs:
3130
build-espflash:
3231
name: Build espflash
@@ -60,7 +59,13 @@ jobs:
6059
name: ${{ matrix.board.mcu }}${{ matrix.board.freq }}
6160
if: ${{ github.repository_owner == 'esp-rs' }}
6261
needs: build-espflash
63-
runs-on: [self-hosted, linux, x64, "${{ matrix.board.mcu }}${{ matrix.board.freq }}" ]
62+
runs-on:
63+
[
64+
self-hosted,
65+
linux,
66+
x64,
67+
"${{ matrix.board.mcu }}${{ matrix.board.freq }}",
68+
]
6469
strategy:
6570
matrix:
6671
board:
@@ -97,7 +102,7 @@ jobs:
97102
- name: flash test
98103
env:
99104
ESPFLASH_PORT: /dev/serial_ports/${{ matrix.board.mcu }}
100-
ESPFLASH_APP: espflash/resources/apps/${{ matrix.board.mcu }}
105+
ESPFLASH_APP: espflash/tests/data/${{ matrix.board.mcu }}
101106
shell: bash
102107
run: |
103108
result=$(espflash_app/espflash flash --no-skip ${{ env.ESPFLASH_APP }} 2>&1)
@@ -140,7 +145,7 @@ jobs:
140145
- name: save-image/write-bin test
141146
env:
142147
ESPFLASH_PORT: /dev/serial_ports/${{ matrix.board.mcu }}
143-
ESPFLASH_APP: espflash/resources/apps/${{ matrix.board.mcu }}
148+
ESPFLASH_APP: espflash/tests/data/${{ matrix.board.mcu }}
144149
run: |
145150
result=$(espflash_app/espflash save-image --merge --chip ${{ matrix.board.mcu }} ${{ matrix.board.flag }} ${{ env.ESPFLASH_APP }} app.bin 2>&1)
146151
echo "$result"
@@ -159,5 +164,3 @@ jobs:
159164
if ! echo "$result" | grep -q "Hello world!"; then
160165
exit 1
161166
fi
162-
163-

LICENSE-APACHE

Lines changed: 169 additions & 43 deletions
Large diffs are not rendered by default.

LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2022 The Espflash Project Developers
1+
Copyright (c) 2022-2025 The Espflash Project Developers
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ Serial flasher utilities for Espressif devices, based loosely on [esptool.py](ht
88

99
Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-H2**, **ESP32-P4**, and **ESP32-S2/S3**.
1010

11-
> [!IMPORTANT]
12-
> Espressif considers espflash and cargo-espflash to be feature-complete at this time. This does not mean we will stop maintaining them; contributions are still welcome. However, we do not plan to pursue further development at this point in time.
13-
14-
1511
## [cargo-espflash](./cargo-espflash/)
1612

1713
A cargo extension for flashing Espressif devices.

espflash/tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Test Resources
22

3-
This document describes how the test files under `tests/resources` were generated, so that they can be re-generated in the future if needed.
3+
This document describes how the test files under `tests/data` were generated, so that they can be re-generated in the future if needed.
44

55
## IDF Bootloader
66

0 commit comments

Comments
 (0)