Skip to content

Commit f5c083e

Browse files
Add support for new targets (#219)
* Create issue_handler.yml * feat: ✨ Add support for new targets * feat: Update template prompts
1 parent 1d2b0fd commit f5c083e

File tree

6 files changed

+25
-9
lines changed

6 files changed

+25
-9
lines changed

.github/workflows/installer-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Build template project
4545
run: |
4646
source ${HOME}/export-esp.sh
47-
cargo generate --git https://github.com/esp-rs/esp-idf-template cargo --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d defaults=true
47+
cargo generate --git https://github.com/esp-rs/esp-idf-template cargo --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d advanced=false
4848
cd test-${{ matrix.board }}
4949
cargo build
5050
# esp-idf-master:
@@ -104,7 +104,7 @@ jobs:
104104
run: |
105105
rustup component add rustfmt
106106
source ${HOME}/export-esp.sh
107-
cargo generate -a esp-rs/esp-template --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d defaults=true
107+
cargo generate -a esp-rs/esp-template --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d advanced=false
108108
cd test-${{ matrix.board }}
109109
cargo build
110110
crate-check:
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Add new issues to project
2+
3+
on:
4+
issues:
5+
types:
6+
- opened
7+
8+
jobs:
9+
add-to-project:
10+
name: Add issue to project
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/[email protected]
14+
with:
15+
project-url: https://github.com/orgs/esp-rs/projects/2
16+
github-token: ${{ secrets.PAT }}

.github/workflows/nigthly-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ jobs:
3535
run: cargo install cargo-generate
3636
- uses: Swatinem/rust-cache@v2
3737
- name: Generate
38-
run: cargo generate -a esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d defaults=true
38+
run: cargo generate -a esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d advanced=false
3939
- name: Build Project
4040
run: cd test; cargo build

.github/workflows/publish-idf-rust-tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
board: ["esp32", "esp32s2", "esp32s3", "esp32c3", "all"]
24+
board: ["esp32", "esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32s2", "esp32s3", "all"]
2525
steps:
2626
- name: Checkout
2727
uses: actions/checkout@v3

build-template-project.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ chmod u+x ${HOME}/.cargo/bin/cargo-generate
77
export USER=esp
88
source /home/esp/export-esp.sh
99

10-
# Build esp-idf-template (release/v4.4)
11-
cargo generate --git https://github.com/esp-rs/esp-idf-template cargo --name test-std-$1 --vcs none --silent -d mcu=$1 -d defaults=true
10+
# Build esp-idf-template
11+
cargo generate esp-rs/esp-idf-template cargo --name test-std-$1 --vcs none --silent -d mcu=$1 -d advanced=false
1212
cd test-std-$1
1313
cargo build
1414
# Build esp-tempalte
15-
cargo generate -a esp-rs/esp-template --name test-nostd-$1 --vcs none --silent -d mcu=$1 -d defaults=true
15+
cargo generate esp-rs/esp-template --name test-nostd-$1 --vcs none --silent -d mcu=$1 -d advanced=false
1616
cd test-nostd-$1
1717
cargo build

idf-rust.Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN ARCH=$($HOME/.cargo/bin/rustup show | grep "Default host" | sed -e 's/.* //'
4646
unzip "${HOME}/.cargo/bin/espflash.zip" -d "${HOME}/.cargo/bin/" && \
4747
rm "${HOME}/.cargo/bin/espflash.zip" && \
4848
chmod u+x "${HOME}/.cargo/bin/espflash" && \
49-
curl -L "https://github.com/bjoernQ/esp-web-flash-server/releases/latest/download/web-flash-${ARCH}.zip" -o "${HOME}/.cargo/bin/web-flash.zip" && \
49+
curl -L "https://github.com/esp-rs/esp-web-flash-server/releases/latest/download/web-flash-${ARCH}.zip" -o "${HOME}/.cargo/bin/web-flash.zip" && \
5050
unzip "${HOME}/.cargo/bin/web-flash.zip" -d "${HOME}/.cargo/bin/" && \
5151
rm "${HOME}/.cargo/bin/web-flash.zip" && \
5252
chmod u+x "${HOME}/.cargo/bin/web-flash"
@@ -65,7 +65,7 @@ RUN if [ -n "${GITHUB_TOKEN}" ]; then export GITHUB_TOKEN=${GITHUB_TOKEN}; fi &&
6565
RUN echo "source /home/${CONTAINER_USER}/export-esp.sh" >> ~/.bashrc
6666

6767
# Set default toolchain
68-
RUN if [ "${ESP_BOARD}" = "all" ] || echo "$ESP_BOARD" | grep -q "esp32c"; then \
68+
RUN if [ "${ESP_BOARD}" = "all" ] || echo "$ESP_BOARD" | grep -q "esp32c" || echo "$ESP_BOARD" | grep -q "esp32h"; then \
6969
rustup default nightly; \
7070
rustup component add rustfmt ; \
7171
else \

0 commit comments

Comments
 (0)