Skip to content
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

Jump to bottom

Update toolchain version to 1.62.1.0 and update cargo-generate installation methods #50

Merged
merged 6 commits into from
Aug 9, 2022
Merged

Update toolchain version to 1.62.1.0 and update cargo-generate installation methods #50

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34b9c1e
Update toolchain version to `1.62.1.0`
SergioGasquez Jul 26, 2022
d542834
Merge branch 'esp-rs:master' into master
SergioGasquez Aug 4, 2022
677d0a6
Update cargo-generate installation methods
SergioGasquez Aug 4, 2022
55e5446
Cleanup
SergioGasquez Aug 4, 2022
e8b26e9
Add `continue-on-error: true`
SergioGasquez Aug 4, 2022
3d69df5
Update repository
SergioGasquez Aug 9, 2022
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
30 changes: 21 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: CI

on:
push:
branches:
pull_request:
schedule:
- cron: '50 7 * * *'
Expand All @@ -24,13 +23,21 @@ jobs:
run: rustup component add rust-src --toolchain ${{ env.rust_toolchain }}-x86_64-unknown-linux-gnu
- name: Setup | Default to nightly
run: rustup default ${{ env.rust_toolchain }}
- name: Setup | cargo-generate
- name: Setup | cargo-generate (binaries)
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
- name: Setup | ldproxy
run: cargo install ldproxy
# - name: (STD, PIO, V4.3.2) Generate (PR)
# if: ${{ github.event_name == 'pull_request' }}
# run: cargo generate --git https://github.com/${{ github.repository }} --branch ${{ github.head_ref }} cargo --name test --vcs none --silent -d mcu=esp32c3 -d std=true -d espidfver=v4.3.2 -d devcontainer=false
# run: cargo generate --git https://github.com/${{ github.event.pull_request.head.repo.full_name }} --branch ${{ github.head_ref }} cargo --name test --vcs none --silent -d mcu=esp32c3 -d std=true -d espidfver=v4.3.2 -d devcontainer=false
# - name: (STD, PIO, V4.3.2) Generate
# if: ${{ github.event_name != 'pull_request' }}
# run: cargo generate --git https://github.com/esp-rs/esp-idf-template --branch ${{ github.ref_name }} cargo --name test --vcs none --silent -d mcu=esp32c3 -d std=true -d espidfver=v4.3.2 -d devcontainer=false
Expand All @@ -42,7 +49,7 @@ jobs:
# run: cd test; cargo build --features pio
- name: (NOSTD, NATIVE, V4.4) Generate (PR)
if: ${{ github.event_name == 'pull_request' }}
run: cargo generate --git https://github.com/${{ github.repository }} --branch ${{ github.head_ref }} cargo --name testnostd --vcs none --silent -d mcu=esp32c3 -d std=false -d espidfver=v4.4 -d devcontainer=false
run: cargo generate --git https://github.com/${{ github.event.pull_request.head.repo.full_name }} --branch ${{ github.head_ref }} cargo --name testnostd --vcs none --silent -d mcu=esp32c3 -d std=false -d espidfver=v4.4 -d devcontainer=false
- name: (NOSTD, NATIVE, V4.4) Generate
if: ${{ github.event_name != 'pull_request' }}
run: cargo generate --git https://github.com/esp-rs/esp-idf-template --branch ${{ github.ref_name }} cargo --name testnostd --vcs none --silent -d mcu=esp32c3 -d std=false -d espidfver=v4.4 -d devcontainer=false
Expand All @@ -54,7 +61,7 @@ jobs:
run: cd testnostd; cargo build
- name: (STD, CMake, V4.4) Generate (PR)
if: ${{ github.event_name == 'pull_request' }}
run: cargo generate --git https://github.com/${{ github.repository }} --branch ${{ github.head_ref }} cmake --name testidf --vcs none --silent -d toolchain=nightly -d std=true -d espidfver=v4.4
run: cargo generate --git https://github.com/${{ github.event.pull_request.head.repo.full_name }} --branch ${{ github.head_ref }} cmake --name testidf --vcs none --silent -d toolchain=nightly -d std=true -d espidfver=v4.4
- name: (STD, CMake, V4.4) Generate
if: ${{ github.event_name != 'pull_request' }}
run: cargo generate --git https://github.com/esp-rs/esp-idf-template --branch ${{ github.ref_name }} cmake --name testidf --vcs none --silent -d toolchain=nightly -d std=true -d espidfver=v4.4
Expand All @@ -75,20 +82,25 @@ jobs:
board: ['esp32', 'esp32s2', 'esp32s3', 'esp32c3']
std: ['true', 'false']
steps:
- name: Install cargo-generate
- name: Install cargo-generate via binaries
id: binaries
continue-on-error: true
run: |
sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-v0.15.2-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz"
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: Install cargo-generate via cargo
if: steps.binaries.outcome != 'success'
run: cargo install cargo-generate
- name: Generate Project - Xtensa Targets (PR)
if: (matrix.board == 'esp32' || matrix.board == 'esp32s2' || matrix.board == 'esp32s3') && github.event_name == 'pull_request'
run: cargo generate --git https://github.com/${{ github.repository }} --branch ${{ github.head_ref }} cargo --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d toolchain=esp -d std=${{ matrix.std }} -d espidfver=v4.4 -d devcontainer=true
run: cargo generate --git https://github.com/${{ github.event.pull_request.head.repo.full_name }} --branch ${{ github.head_ref }} cargo --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d toolchain=esp -d std=${{ matrix.std }} -d espidfver=v4.4 -d devcontainer=true
- name: Generate Project - Xtensa Targets
if: (matrix.board == 'esp32' || matrix.board == 'esp32s2' || matrix.board == 'esp32s3') && github.event_name != 'pull_request'
run: cargo generate --git https://github.com/esp-rs/esp-idf-template --branch ${{ github.ref_name }} cargo --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d toolchain=esp -d std=${{ matrix.std }} -d espidfver=v4.4 -d devcontainer=true
- name: Generate Project - RiscV Targets (PR)
if: matrix.board == 'esp32c3' && github.event_name == 'pull_request'
run: cargo generate --git https://github.com/${{ github.repository }} --branch ${{ github.head_ref }} cargo --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d toolchain=nightly -d std=${{ matrix.std }} -d espidfver=v4.4 -d devcontainer=true
run: cargo generate --git https://github.com/${{ github.event.pull_request.head.repo.full_name }} --branch ${{ github.head_ref }} cargo --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d toolchain=nightly -d std=${{ matrix.std }} -d espidfver=v4.4 -d devcontainer=true
- name: Generate Project - RiscV Targets
if: matrix.board == 'esp32c3' && github.event_name != 'pull_request'
run: cargo generate --git https://github.com/esp-rs/esp-idf-template --branch ${{ github.ref_name }} cargo --name test-${{ matrix.board }} --vcs none --silent -d mcu=${{ matrix.board }} -d toolchain=nightly -d std=${{ matrix.std }} -d espidfver=v4.4 -d devcontainer=true
Expand Down