From 43adf2a75c580e67390c1d6c277f42467b4f544e Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 28 Apr 2023 09:00:04 +0200 Subject: [PATCH 1/2] =?UTF-8?q?ci:=20=E2=9C=A8=20Update=20cargo-generate?= =?UTF-8?q?=20prompts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/installer-check.yaml | 4 ++-- .github/workflows/nigthly-check.yaml | 2 +- README.md | 2 +- build-template-project.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/installer-check.yaml b/.github/workflows/installer-check.yaml index 595af35f..7df07491 100644 --- a/.github/workflows/installer-check.yaml +++ b/.github/workflows/installer-check.yaml @@ -44,7 +44,7 @@ jobs: - name: Build template project run: | source ${HOME}/export-esp.sh - cargo generate --git https://github.com/esp-rs/esp-idf-template cargo --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d std=true -d espidfver=v4.4 -d devcontainer=false + 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 cd test-${{ matrix.board }} cargo build # esp-idf-master: @@ -103,7 +103,7 @@ jobs: - name: Build template project run: | source ${HOME}/export-esp.sh - cargo generate -a esp-rs/esp-template --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d devcontainer=false -d alloc=false + cargo generate -a esp-rs/esp-template --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d defaults=true cd test-${{ matrix.board }} cargo build crate-check: diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index de6863d2..812b9cd1 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -35,6 +35,6 @@ jobs: run: cargo install cargo-generate - uses: Swatinem/rust-cache@v2 - name: Generate - run: cargo generate -a esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false -d alloc=false + run: cargo generate -a esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d defaults=true - name: Build Project run: cd test; cargo build diff --git a/README.md b/README.md index 589dd25d..abfb36d3 100644 --- a/README.md +++ b/README.md @@ -269,7 +269,7 @@ rustup target add riscv32imc-unknown-none-elf ```sh # STD Project - cargo generate https://github.com/esp-rs/esp-idf-template cargo + cargo generate esp-rs/esp-idf-template cargo # NO-STD (Bare-metal) Project cargo generate -a esp-rs/esp-template ``` diff --git a/build-template-project.sh b/build-template-project.sh index 1f62a675..908c317a 100644 --- a/build-template-project.sh +++ b/build-template-project.sh @@ -12,6 +12,6 @@ cargo generate --git https://github.com/esp-rs/esp-idf-template cargo --name tes cd test-std-$1 cargo build # Build esp-tempalte -cargo generate -a esp-rs/esp-template --name test-nostd-$1 --vcs none --silent -d mcu=$1 -d devcontainer=false -d alloc=false -d wokwi=false +cargo generate -a esp-rs/esp-template --name test-nostd-$1 --vcs none --silent -d mcu=$1 -d defaults=true cd test-nostd-$1 cargo build From a9ed403b4b1589ef957c9c40d43f128c53300dd3 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 28 Apr 2023 09:06:00 +0200 Subject: [PATCH 2/2] =?UTF-8?q?ci:=20=E2=9C=A8=20Install=20rustfmt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/installer-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/installer-check.yaml b/.github/workflows/installer-check.yaml index 7df07491..1d4e1f58 100644 --- a/.github/workflows/installer-check.yaml +++ b/.github/workflows/installer-check.yaml @@ -102,6 +102,7 @@ jobs: --export-file "${HOME}/export-esp.sh" - name: Build template project run: | + rustup component add rustfmt source ${HOME}/export-esp.sh cargo generate -a esp-rs/esp-template --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d defaults=true cd test-${{ matrix.board }}