From 5378726f93078ef5dfdb44f69ac1099a1eb030e6 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 8 Sep 2022 16:35:51 +0200 Subject: [PATCH 01/19] Add nightly CI --- .github/workflows/nigthly-check.yaml | 108 +++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 .github/workflows/nigthly-check.yaml diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml new file mode 100644 index 00000000..07785157 --- /dev/null +++ b/.github/workflows/nigthly-check.yaml @@ -0,0 +1,108 @@ +name: Nightly checks + +on: + push: + pull_request: + schedule: + - cron: "50 7 * * *" + +env: + rust_toolchain: nightly + +jobs: + nightly: + name: Build | Clippy | Fmt Check (esp32c3) + runs-on: ubuntu-latest + steps: + - name: Setup | Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + components: rustfmt, clippy + + - name: Setup | Std + run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu + + - name: Setup | Default to nightly + run: rustup default nightly + + - name: Setup | cargo-generate (binary) + id: binaries + continue-on-error: true + run: | + sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz" + tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin + chmod u+x /home/runner/.cargo/bin/cargo-generate + + - name: Setup | cargo-generate (cargo) + if: steps.binaries.outcome != 'success' + run: cargo install cargo-generate + + - uses: Swatinem/rust-cache@v1 + + - uses: actions/checkout@v3 + with: + path: /home/runner/work/esp-template/esp-template/github-esp-template + + - name: Generate + run: cargo generate --path /home/runner/work/esp-template/esp-template/github-esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + + - name: Build Project + run: cd test-esp32c3; cargo build + previous-nightly: + name: Build | Clippy | Fmt Check (esp32c3) + runs-on: ubuntu-latest + steps: + - name: Get current date + uses: josStorer/get-current-time@v2.0.1 + id: current-date + with: + format: YYYY-MM-DD + - name: Set environment + env: + NIGHTLY_VERSION: "nightly-${{ steps.current-date.outputs.time }}" + - name: Setup | Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ env.NIGHTLY_VERSION }} + components: rustfmt, clippy + + - name: Setup | Std + run: rustup component add rust-src --toolchain ${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu + + - name: Setup | Default to nightly + run: rustup default ${{ env.NIGHTLY_VERSION }} + + - name: Setup | cargo-generate (binary) + id: binaries + continue-on-error: true + run: | + sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz" + tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin + chmod u+x /home/runner/.cargo/bin/cargo-generate + + - name: Setup | cargo-generate (cargo) + if: steps.binaries.outcome != 'success' + run: cargo install cargo-generate + + - uses: Swatinem/rust-cache@v1 + + - uses: actions/checkout@v3 + with: + path: /home/runner/work/esp-template/esp-template/github-esp-template + + - name: Generate + run: cargo generate --path /home/runner/work/esp-template/esp-template/github-esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + + - name: Build Project + run: cd test-esp32c3; cargo build + previous-nightly-2: + name: Build | Clippy | Fmt Check (esp32c3) + runs-on: ubuntu-latest + steps: + - uses: ajilraju/actions-date@v0.1 + id: date + with: + args: date --date='2 days ago' + - name: Print + run: echo ${{ steps.date.outputs }} From 2bd15fefcb67b278fe16fa9f3187a3863490f1ed Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 9 Sep 2022 16:47:00 +0200 Subject: [PATCH 02/19] =?UTF-8?q?ci:=20=F0=9F=90=9B=20Export=20`NIGHTLY=5F?= =?UTF-8?q?VERSION`=20env=20variable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 07785157..2db59b1a 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -59,8 +59,7 @@ jobs: with: format: YYYY-MM-DD - name: Set environment - env: - NIGHTLY_VERSION: "nightly-${{ steps.current-date.outputs.time }}" + run: echo "NIGHTLY_VERSION=nightly-${{ steps.current-date.outputs.time }}" >> $GITHUB_ENV - name: Setup | Rust uses: actions-rs/toolchain@v1 with: From e59c61cf7a10c3d55639518181d0c963cba7f855 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 9 Sep 2022 16:58:09 +0200 Subject: [PATCH 03/19] =?UTF-8?q?ci:=20=F0=9F=A7=AA=20Test=20getting=20yes?= =?UTF-8?q?terday=20date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 2db59b1a..53e98fc6 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -99,9 +99,7 @@ jobs: name: Build | Clippy | Fmt Check (esp32c3) runs-on: ubuntu-latest steps: - - uses: ajilraju/actions-date@v0.1 - id: date - with: - args: date --date='2 days ago' - - name: Print - run: echo ${{ steps.date.outputs }} + - name: Set env + run: echo "GITHUB_SHA_SHORT=$(date -d '-1 day' '+%Y%d%m')" >> $GITHUB_ENV + - name: Test + run: echo $GITHUB_SHA_SHORT From 76e032f3271780e2524ed50ca1766556efe7beeb Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 9 Sep 2022 17:01:10 +0200 Subject: [PATCH 04/19] =?UTF-8?q?ci:=20=F0=9F=A7=AA=20Test=20using=20yeste?= =?UTF-8?q?rday=20nigthly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 65 +++++++++++++++++++++------- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 53e98fc6..aa284f50 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -49,17 +49,60 @@ jobs: - name: Build Project run: cd test-esp32c3; cargo build + # previous-nightly: + # name: Build | Clippy | Fmt Check (esp32c3) + # runs-on: ubuntu-latest + # steps: + # - name: Get current date + # uses: josStorer/get-current-time@v2.0.1 + # id: current-date + # with: + # format: YYYY-MM-DD + # - name: Set environment + # run: echo "NIGHTLY_VERSION=nightly-${{ steps.current-date.outputs.time }}" >> $GITHUB_ENV + # - name: Setup | Rust + # uses: actions-rs/toolchain@v1 + # with: + # toolchain: ${{ env.NIGHTLY_VERSION }} + # components: rustfmt, clippy + + # - name: Setup | Std + # run: rustup component add rust-src --toolchain ${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu + + # - name: Setup | Default to nightly + # run: rustup default ${{ env.NIGHTLY_VERSION }} + + # - name: Setup | cargo-generate (binary) + # id: binaries + # continue-on-error: true + # run: | + # sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz" + # tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin + # chmod u+x /home/runner/.cargo/bin/cargo-generate + + # - name: Setup | cargo-generate (cargo) + # if: steps.binaries.outcome != 'success' + # run: cargo install cargo-generate + + # - uses: Swatinem/rust-cache@v1 + + # - uses: actions/checkout@v3 + # with: + # path: /home/runner/work/esp-template/esp-template/github-esp-template + + # - name: Generate + # run: cargo generate --path /home/runner/work/esp-template/esp-template/github-esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + + # - name: Build Project + # run: cd test-esp32c3; cargo build previous-nightly: name: Build | Clippy | Fmt Check (esp32c3) runs-on: ubuntu-latest steps: - - name: Get current date - uses: josStorer/get-current-time@v2.0.1 - id: current-date - with: - format: YYYY-MM-DD - - name: Set environment - run: echo "NIGHTLY_VERSION=nightly-${{ steps.current-date.outputs.time }}" >> $GITHUB_ENV + - name: Set env + run: echo "NIGHTLY_VERSION=$(date -d '-1 day' '+%Y-%d-%m')" >> $GITHUB_ENV + - name: Test + run: echo $NIGHTLY_VERSION - name: Setup | Rust uses: actions-rs/toolchain@v1 with: @@ -95,11 +138,3 @@ jobs: - name: Build Project run: cd test-esp32c3; cargo build - previous-nightly-2: - name: Build | Clippy | Fmt Check (esp32c3) - runs-on: ubuntu-latest - steps: - - name: Set env - run: echo "GITHUB_SHA_SHORT=$(date -d '-1 day' '+%Y%d%m')" >> $GITHUB_ENV - - name: Test - run: echo $GITHUB_SHA_SHORT From c34b3fbdff33f5aba2665f44cbcdf81d11d3c10f Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 9 Sep 2022 17:06:54 +0200 Subject: [PATCH 05/19] =?UTF-8?q?ci:=20=F0=9F=90=9B=20Fix=20`nigthly`=20na?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index aa284f50..c72edba0 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -106,14 +106,14 @@ jobs: - name: Setup | Rust uses: actions-rs/toolchain@v1 with: - toolchain: ${{ env.NIGHTLY_VERSION }} + toolchain: nightly-${{ env.NIGHTLY_VERSION }} components: rustfmt, clippy - name: Setup | Std - run: rustup component add rust-src --toolchain ${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu - name: Setup | Default to nightly - run: rustup default ${{ env.NIGHTLY_VERSION }} + run: rustup default nightly-${{ env.NIGHTLY_VERSION }} - name: Setup | cargo-generate (binary) id: binaries From 820298eee6c0de67f8671e1da7d9c9b5eb355904 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 9 Sep 2022 17:15:42 +0200 Subject: [PATCH 06/19] =?UTF-8?q?ci:=20=E2=9C=A8=20Add=20next-prior?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 85 ++++++++++++---------------- 1 file changed, 36 insertions(+), 49 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index c72edba0..09a42a7b 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -10,7 +10,7 @@ env: rust_toolchain: nightly jobs: - nightly: + current-nightly: name: Build | Clippy | Fmt Check (esp32c3) runs-on: ubuntu-latest steps: @@ -49,53 +49,7 @@ jobs: - name: Build Project run: cd test-esp32c3; cargo build - # previous-nightly: - # name: Build | Clippy | Fmt Check (esp32c3) - # runs-on: ubuntu-latest - # steps: - # - name: Get current date - # uses: josStorer/get-current-time@v2.0.1 - # id: current-date - # with: - # format: YYYY-MM-DD - # - name: Set environment - # run: echo "NIGHTLY_VERSION=nightly-${{ steps.current-date.outputs.time }}" >> $GITHUB_ENV - # - name: Setup | Rust - # uses: actions-rs/toolchain@v1 - # with: - # toolchain: ${{ env.NIGHTLY_VERSION }} - # components: rustfmt, clippy - - # - name: Setup | Std - # run: rustup component add rust-src --toolchain ${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu - - # - name: Setup | Default to nightly - # run: rustup default ${{ env.NIGHTLY_VERSION }} - - # - name: Setup | cargo-generate (binary) - # id: binaries - # continue-on-error: true - # run: | - # sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz" - # tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin - # chmod u+x /home/runner/.cargo/bin/cargo-generate - - # - name: Setup | cargo-generate (cargo) - # if: steps.binaries.outcome != 'success' - # run: cargo install cargo-generate - - # - uses: Swatinem/rust-cache@v1 - - # - uses: actions/checkout@v3 - # with: - # path: /home/runner/work/esp-template/esp-template/github-esp-template - - # - name: Generate - # run: cargo generate --path /home/runner/work/esp-template/esp-template/github-esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - - # - name: Build Project - # run: cd test-esp32c3; cargo build - previous-nightly: + prior-nightly: name: Build | Clippy | Fmt Check (esp32c3) runs-on: ubuntu-latest steps: @@ -107,7 +61,6 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: nightly-${{ env.NIGHTLY_VERSION }} - components: rustfmt, clippy - name: Setup | Std run: rustup component add rust-src --toolchain nightly-${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu @@ -138,3 +91,37 @@ jobs: - name: Build Project run: cd test-esp32c3; cargo build + next-prior-nightly: + name: Build | Clippy | Fmt Check (esp32c3) + runs-on: ubuntu-latest + steps: + - name: Set env + run: echo "NIGHTLY_VERSION=$(date -d '-2 day' '+%Y-%d-%m')" >> $GITHUB_ENV + - name: Test + run: echo $NIGHTLY_VERSION + - name: Setup | Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly-${{ env.NIGHTLY_VERSION }} + - name: Setup | Std + run: rustup component add rust-src --toolchain nightly-${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu + - name: Setup | Default to nightly + run: rustup default nightly-${{ env.NIGHTLY_VERSION }} + - name: Setup | cargo-generate (binary) + id: binaries + continue-on-error: true + run: | + sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz" + tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin + chmod u+x /home/runner/.cargo/bin/cargo-generate + - name: Setup | cargo-generate (cargo) + if: steps.binaries.outcome != 'success' + run: cargo install cargo-generate + - uses: Swatinem/rust-cache@v1 + - uses: actions/checkout@v3 + with: + path: /home/runner/work/esp-template/esp-template/github-esp-template + - name: Generate + run: cargo generate --path /home/runner/work/esp-template/esp-template/github-esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + - name: Build Project + run: cd test-esp32c3; cargo build From 09771255f5cd30d1e7b7074c597d10a5839ebaef Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 9 Sep 2022 17:57:38 +0200 Subject: [PATCH 07/19] =?UTF-8?q?ci:=20=F0=9F=90=9B=20Use=20git=20for=20ca?= =?UTF-8?q?rgo=20generate=20path=20and=20format=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 35 ++++------------------------ 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 09a42a7b..39a14ce7 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -1,13 +1,11 @@ name: Nightly checks on: - push: - pull_request: schedule: - cron: "50 7 * * *" env: - rust_toolchain: nightly + CARGO_TERM_COLOR: always jobs: current-nightly: @@ -19,13 +17,10 @@ jobs: with: toolchain: nightly components: rustfmt, clippy - - name: Setup | Std run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - - name: Setup | Default to nightly run: rustup default nightly - - name: Setup | cargo-generate (binary) id: binaries continue-on-error: true @@ -33,20 +28,12 @@ jobs: sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz" tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin chmod u+x /home/runner/.cargo/bin/cargo-generate - - name: Setup | cargo-generate (cargo) if: steps.binaries.outcome != 'success' run: cargo install cargo-generate - - uses: Swatinem/rust-cache@v1 - - - uses: actions/checkout@v3 - with: - path: /home/runner/work/esp-template/esp-template/github-esp-template - - name: Generate - run: cargo generate --path /home/runner/work/esp-template/esp-template/github-esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - + run: cargo generate --git https://github.com/esp-rs/esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project run: cd test-esp32c3; cargo build prior-nightly: @@ -61,13 +48,10 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: nightly-${{ env.NIGHTLY_VERSION }} - - name: Setup | Std run: rustup component add rust-src --toolchain nightly-${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu - - name: Setup | Default to nightly run: rustup default nightly-${{ env.NIGHTLY_VERSION }} - - name: Setup | cargo-generate (binary) id: binaries continue-on-error: true @@ -75,20 +59,12 @@ jobs: sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz" tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin chmod u+x /home/runner/.cargo/bin/cargo-generate - - name: Setup | cargo-generate (cargo) if: steps.binaries.outcome != 'success' run: cargo install cargo-generate - - uses: Swatinem/rust-cache@v1 - - - uses: actions/checkout@v3 - with: - path: /home/runner/work/esp-template/esp-template/github-esp-template - - name: Generate - run: cargo generate --path /home/runner/work/esp-template/esp-template/github-esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - + run: cargo generate --git https://github.com/esp-rs/esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project run: cd test-esp32c3; cargo build next-prior-nightly: @@ -118,10 +94,7 @@ jobs: if: steps.binaries.outcome != 'success' run: cargo install cargo-generate - uses: Swatinem/rust-cache@v1 - - uses: actions/checkout@v3 - with: - path: /home/runner/work/esp-template/esp-template/github-esp-template - name: Generate - run: cargo generate --path /home/runner/work/esp-template/esp-template/github-esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + run: cargo generate --git https://github.com/esp-rs/esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project run: cd test-esp32c3; cargo build From 556cda32819d17ab1ffd4c0058afba64115cd437 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 9 Sep 2022 18:02:02 +0200 Subject: [PATCH 08/19] =?UTF-8?q?ci:=20=F0=9F=8E=A8=20Rename=20jobs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 39a14ce7..eaa57225 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -9,7 +9,7 @@ env: jobs: current-nightly: - name: Build | Clippy | Fmt Check (esp32c3) + name: Current nightly runs-on: ubuntu-latest steps: - name: Setup | Rust @@ -33,11 +33,11 @@ jobs: run: cargo install cargo-generate - uses: Swatinem/rust-cache@v1 - name: Generate - run: cargo generate --git https://github.com/esp-rs/esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project - run: cd test-esp32c3; cargo build + run: cd test; cargo build prior-nightly: - name: Build | Clippy | Fmt Check (esp32c3) + name: Prior nightly runs-on: ubuntu-latest steps: - name: Set env @@ -64,11 +64,11 @@ jobs: run: cargo install cargo-generate - uses: Swatinem/rust-cache@v1 - name: Generate - run: cargo generate --git https://github.com/esp-rs/esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project - run: cd test-esp32c3; cargo build + run: cd test; cargo build next-prior-nightly: - name: Build | Clippy | Fmt Check (esp32c3) + name: Next prior nightly runs-on: ubuntu-latest steps: - name: Set env @@ -95,6 +95,6 @@ jobs: run: cargo install cargo-generate - uses: Swatinem/rust-cache@v1 - name: Generate - run: cargo generate --git https://github.com/esp-rs/esp-template --name test-esp32c3 --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project - run: cd test-esp32c3; cargo build + run: cd test; cargo build From 8b08778ced2d2a7c8f88cf60759ea1e9d52e856e Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 9 Sep 2022 18:03:16 +0200 Subject: [PATCH 09/19] =?UTF-8?q?ci:=20=E2=9A=A1=EF=B8=8F=20Add=20manual?= =?UTF-8?q?=20trigger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index eaa57225..504c99ef 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -3,6 +3,7 @@ name: Nightly checks on: schedule: - cron: "50 7 * * *" + workflow_dispatch: env: CARGO_TERM_COLOR: always From da7910543493067270860d7230e3ef31ab1ec04e Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 9 Sep 2022 18:07:45 +0200 Subject: [PATCH 10/19] =?UTF-8?q?ci:=20=F0=9F=90=9B=20Override=20default?= =?UTF-8?q?=20toolchain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 504c99ef..276f5638 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -67,7 +67,7 @@ jobs: - name: Generate run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project - run: cd test; cargo build + run: cd test; cargo +nightly-${{ env.NIGHTLY_VERSION }} build next-prior-nightly: name: Next prior nightly runs-on: ubuntu-latest @@ -98,4 +98,4 @@ jobs: - name: Generate run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project - run: cd test; cargo build + run: cd test; cargo +nightly-${{ env.NIGHTLY_VERSION }} build From b6a5f5278e12aa664d3e9ee9d40498571a9c0f17 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 12 Sep 2022 09:18:56 +0200 Subject: [PATCH 11/19] =?UTF-8?q?ci:=20=F0=9F=90=9B=20Fix=20date=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 276f5638..9bae9483 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set env - run: echo "NIGHTLY_VERSION=$(date -d '-1 day' '+%Y-%d-%m')" >> $GITHUB_ENV + run: echo "NIGHTLY_VERSION=$(date -d '-1 day' '+%Y-%m-%d')" >> $GITHUB_ENV - name: Test run: echo $NIGHTLY_VERSION - name: Setup | Rust @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set env - run: echo "NIGHTLY_VERSION=$(date -d '-2 day' '+%Y-%d-%m')" >> $GITHUB_ENV + run: echo "NIGHTLY_VERSION=$(date -d '-2 day' '+%Y-%m-%d')" >> $GITHUB_ENV - name: Test run: echo $NIGHTLY_VERSION - name: Setup | Rust From 8b7f31c50070b9d9a650a39d7510e4458cc9e42c Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 12 Sep 2022 09:23:41 +0200 Subject: [PATCH 12/19] =?UTF-8?q?ci:=20=F0=9F=8E=A8=20Remove=20unecesary?= =?UTF-8?q?=20print?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 9bae9483..b30baa6b 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -43,8 +43,6 @@ jobs: steps: - name: Set env run: echo "NIGHTLY_VERSION=$(date -d '-1 day' '+%Y-%m-%d')" >> $GITHUB_ENV - - name: Test - run: echo $NIGHTLY_VERSION - name: Setup | Rust uses: actions-rs/toolchain@v1 with: @@ -73,17 +71,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Set env - run: echo "NIGHTLY_VERSION=$(date -d '-2 day' '+%Y-%m-%d')" >> $GITHUB_ENV - - name: Test - run: echo $NIGHTLY_VERSION + run: echo "NIGHTLY_VERSION=nightly-$(date -d '-2 day' '+%Y-%m-%d')" >> $GITHUB_ENV - name: Setup | Rust uses: actions-rs/toolchain@v1 with: - toolchain: nightly-${{ env.NIGHTLY_VERSION }} + toolchain: ${{ env.NIGHTLY_VERSION }} - name: Setup | Std - run: rustup component add rust-src --toolchain nightly-${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain ${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu - name: Setup | Default to nightly - run: rustup default nightly-${{ env.NIGHTLY_VERSION }} + run: rustup default ${{ env.NIGHTLY_VERSION }} - name: Setup | cargo-generate (binary) id: binaries continue-on-error: true @@ -98,4 +94,4 @@ jobs: - name: Generate run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project - run: cd test; cargo +nightly-${{ env.NIGHTLY_VERSION }} build + run: cd test; cargo +${{ env.NIGHTLY_VERSION }} build From 1918df23f2e66bd304840e12946f5c284554df9b Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 12 Sep 2022 09:33:30 +0200 Subject: [PATCH 13/19] =?UTF-8?q?ci:=20=F0=9F=8E=A8=20Remove=20verbosity?= =?UTF-8?q?=20of=20nighthly=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index b30baa6b..0225aa9b 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -42,15 +42,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Set env - run: echo "NIGHTLY_VERSION=$(date -d '-1 day' '+%Y-%m-%d')" >> $GITHUB_ENV + run: echo "NIGHTLY_VERSION=nightly-$$(date -d '-1 day' '+%Y-%m-%d')" >> $GITHUB_ENV - name: Setup | Rust uses: actions-rs/toolchain@v1 with: - toolchain: nightly-${{ env.NIGHTLY_VERSION }} + toolchain: ${{ env.NIGHTLY_VERSION }} - name: Setup | Std - run: rustup component add rust-src --toolchain nightly-${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain ${{ env.NIGHTLY_VERSION }}-x86_64-unknown-linux-gnu - name: Setup | Default to nightly - run: rustup default nightly-${{ env.NIGHTLY_VERSION }} + run: rustup default ${{ env.NIGHTLY_VERSION }} - name: Setup | cargo-generate (binary) id: binaries continue-on-error: true @@ -65,7 +65,7 @@ jobs: - name: Generate run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project - run: cd test; cargo +nightly-${{ env.NIGHTLY_VERSION }} build + run: cd test; cargo +{{ env.NIGHTLY_VERSION }} build next-prior-nightly: name: Next prior nightly runs-on: ubuntu-latest From e758362d94aaae38298520c0d9861211f4088154 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 12 Sep 2022 09:38:23 +0200 Subject: [PATCH 14/19] =?UTF-8?q?ci:=20=F0=9F=A7=AA=20Test=20using=20matri?= =?UTF-8?q?x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 0225aa9b..42c826c8 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -95,3 +95,40 @@ jobs: run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project run: cd test; cargo +${{ env.NIGHTLY_VERSION }} build + matrix-test: + name: Current nightly + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + version: + [ + "nightly", + "nightly-$(date -d '-1 day' '+%Y-%m-%d')", + "nightly-$(date -d '-2 day' '+%Y-%m-%d')", + ] + steps: + - name: Setup | Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.version }} + components: rustfmt, clippy + - name: Setup | Std + run: rustup component add rust-src --toolchain ${{ matrix.version }}-x86_64-unknown-linux-gnu + - name: Setup | Default to nightly + run: rustup default ${{ matrix.version }} + - name: Setup | cargo-generate (binary) + id: binaries + continue-on-error: true + run: | + sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz" + tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin + chmod u+x /home/runner/.cargo/bin/cargo-generate + - name: Setup | cargo-generate (cargo) + if: steps.binaries.outcome != 'success' + run: cargo install cargo-generate + - uses: Swatinem/rust-cache@v1 + - name: Generate + run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + - name: Build Project + run: cd test; cargo +${{ matrix.version }} build From ba4e27b02c7020a52557dfd8082837ff15cad988 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 12 Sep 2022 09:41:14 +0200 Subject: [PATCH 15/19] =?UTF-8?q?ci:=20=F0=9F=94=A5=20Remove=20matrix=20te?= =?UTF-8?q?st?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 39 +--------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 42c826c8..e620dbeb 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set env - run: echo "NIGHTLY_VERSION=nightly-$$(date -d '-1 day' '+%Y-%m-%d')" >> $GITHUB_ENV + run: echo "NIGHTLY_VERSION=nightly-$(date -d '-1 day' '+%Y-%m-%d')" >> $GITHUB_ENV - name: Setup | Rust uses: actions-rs/toolchain@v1 with: @@ -95,40 +95,3 @@ jobs: run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project run: cd test; cargo +${{ env.NIGHTLY_VERSION }} build - matrix-test: - name: Current nightly - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - version: - [ - "nightly", - "nightly-$(date -d '-1 day' '+%Y-%m-%d')", - "nightly-$(date -d '-2 day' '+%Y-%m-%d')", - ] - steps: - - name: Setup | Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.version }} - components: rustfmt, clippy - - name: Setup | Std - run: rustup component add rust-src --toolchain ${{ matrix.version }}-x86_64-unknown-linux-gnu - - name: Setup | Default to nightly - run: rustup default ${{ matrix.version }} - - name: Setup | cargo-generate (binary) - id: binaries - continue-on-error: true - run: | - sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz" - tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin - chmod u+x /home/runner/.cargo/bin/cargo-generate - - name: Setup | cargo-generate (cargo) - if: steps.binaries.outcome != 'success' - run: cargo install cargo-generate - - uses: Swatinem/rust-cache@v1 - - name: Generate - run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - - name: Build Project - run: cd test; cargo +${{ matrix.version }} build From 658332d5557460b0e6891f552a2aae2460f3f819 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 12 Sep 2022 09:48:28 +0200 Subject: [PATCH 16/19] =?UTF-8?q?ci:=20=F0=9F=90=9B=20Fix=20typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index e620dbeb..575f4cea 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -65,7 +65,7 @@ jobs: - name: Generate run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false - name: Build Project - run: cd test; cargo +{{ env.NIGHTLY_VERSION }} build + run: cd test; cargo +${{ env.NIGHTLY_VERSION }} build next-prior-nightly: name: Next prior nightly runs-on: ubuntu-latest From 58a1adc12ac03bf3fe1fd33225eeb356ea50d3d0 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 15 Sep 2022 10:05:22 +0200 Subject: [PATCH 17/19] =?UTF-8?q?ci:=20=F0=9F=90=9B=20Add=20`alloc`=20defi?= =?UTF-8?q?ne?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nigthly-check.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nigthly-check.yaml b/.github/workflows/nigthly-check.yaml index 575f4cea..0052b872 100644 --- a/.github/workflows/nigthly-check.yaml +++ b/.github/workflows/nigthly-check.yaml @@ -34,7 +34,7 @@ jobs: run: cargo install cargo-generate - uses: Swatinem/rust-cache@v1 - name: Generate - run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false -d alloc=false - name: Build Project run: cd test; cargo build prior-nightly: @@ -63,7 +63,7 @@ jobs: run: cargo install cargo-generate - uses: Swatinem/rust-cache@v1 - name: Generate - run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false -d alloc=false - name: Build Project run: cd test; cargo +${{ env.NIGHTLY_VERSION }} build next-prior-nightly: @@ -92,6 +92,6 @@ jobs: run: cargo install cargo-generate - uses: Swatinem/rust-cache@v1 - name: Generate - run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false + run: cargo generate --git https://github.com/esp-rs/esp-template --name test --vcs none --silent -d mcu=esp32c3 -d devcontainer=false -d alloc=false - name: Build Project run: cd test; cargo +${{ env.NIGHTLY_VERSION }} build From 8b32a78a34469644b558dc5d3524bc376d0b8525 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 15 Sep 2022 10:07:58 +0200 Subject: [PATCH 18/19] =?UTF-8?q?ci:=20=F0=9F=90=9B=20Add=20`alloc`=20defi?= =?UTF-8?q?ne=20to=20esp-template=20projects?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/installer-check.yaml | 18 ++++++++++++++---- build-template-project.sh | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/installer-check.yaml b/.github/workflows/installer-check.yaml index 772642de..f4f0a779 100644 --- a/.github/workflows/installer-check.yaml +++ b/.github/workflows/installer-check.yaml @@ -1,7 +1,7 @@ name: Test installer by building template projects env: - xtensa-toolchain-version: '1.62.1.0' + xtensa-toolchain-version: "1.62.1.0" on: push: @@ -103,7 +103,7 @@ jobs: - name: Build template project run: | source ${HOME}/export-esp.sh - cargo generate --git https://github.com/esp-rs/esp-template --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d devcontainer=false + cargo generate --git https://github.com/esp-rs/esp-template --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d devcontainer=false -d alloc=false cd test-${{ matrix.board }} cargo build crate-check: @@ -112,7 +112,12 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - extra-crates: ["", "ldproxy", "espflash cargo-espflash ldproxy cargo-generate wokwi-server web-flash"] + extra-crates: + [ + "", + "ldproxy", + "espflash cargo-espflash ldproxy cargo-generate wokwi-server web-flash", + ] runs-on: ${{ matrix.os }} defaults: run: @@ -172,7 +177,12 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - arguments: ["", "--toolchain-version $xtensa-toolchain-version --export-file export-esp-rust.sh", "--build-target all"] + arguments: + [ + "", + "--toolchain-version $xtensa-toolchain-version --export-file export-esp-rust.sh", + "--build-target all", + ] runs-on: ${{ matrix.os }} defaults: run: diff --git a/build-template-project.sh b/build-template-project.sh index dc52fafc..2be037f0 100644 --- a/build-template-project.sh +++ b/build-template-project.sh @@ -5,7 +5,7 @@ source /home/esp/export-esp.sh if [[ "$1" == 'esp-idf-template' ]]; then cargo generate --git https://github.com/esp-rs/esp-idf-template cargo --name test-$2 --vcs none --silent -d mcu=$2 -d std=true -d espidfver=$3 -d devcontainer=false elif [[ "$1" == 'esp-template' ]]; then - cargo generate --git https://github.com/esp-rs/esp-template --name test-$2 --vcs none --silent -d mcu=$2 -d devcontainer=false + cargo generate --git https://github.com/esp-rs/esp-template --name test-$2 --vcs none --silent -d mcu=$2 -d devcontainer=false -d alloc=false fi cd test-$2 cargo build From 9400b0f64f3a61abe35e47f53bc458de6183be42 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 22 Sep 2022 09:01:09 +0200 Subject: [PATCH 19/19] =?UTF-8?q?build:=20=E2=AC=86=EF=B8=8F=20Update=20to?= =?UTF-8?q?olchain=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/installer-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installer-check.yaml b/.github/workflows/installer-check.yaml index f4f0a779..e7345ccf 100644 --- a/.github/workflows/installer-check.yaml +++ b/.github/workflows/installer-check.yaml @@ -1,7 +1,7 @@ name: Test installer by building template projects env: - xtensa-toolchain-version: "1.62.1.0" + xtensa-toolchain-version: "1.64.0.0" on: push: