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

Fix timeout issue due to cargo-audit #54

Merged
merged 6 commits into from
Oct 18, 2023
Merged

Fix timeout issue due to cargo-audit #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f4a07e
fix: Add cargo clean
SergioGasquez Oct 17, 2023
92f5e8f
feat: Bump Xtensa Rust Version
SergioGasquez Oct 17, 2023
1fae9b1
fix: Delete cache
SergioGasquez Oct 17, 2023
5857773
fix: Fix timeouts
SergioGasquez Oct 17, 2023
1dd59d4
fix: Update order
SergioGasquez Oct 18, 2023
508250a
fix: Pin cargo-audit version and revert changes
SergioGasquez Oct 18, 2023
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
2 changes: 1 addition & 1 deletion rust-nostd-avr/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN cargo --version
RUN rustup show

# Install extra crates
RUN cargo install cargo-audit cargo-generate
RUN cargo install cargo-audit@0.17.6 cargo-generate

# Generate project templates
RUN cargo generate -a Rahix/avr-hal-template --name rust-project-uno --vcs none --silent -d board="Arduino Uno"
Expand Down
2 changes: 1 addition & 1 deletion rust-nostd-avr/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ fi

cargo audit
cargo build --release --out-dir output -Z unstable-options
avr-objcopy -R .eeprom -O ihex ./target/${MCU}/release/${PROJECT_NAME}.elf ${HOME}/build-out/project.hex
avr-objcopy -R .eeprom -O ihex ./target/${MCU}/release/${PROJECT_NAME}.elf ${HOME}/build-out/project.hex
cp ./target/${MCU}/release/${PROJECT_NAME}.elf ${HOME}/build-out/project.elf
4 changes: 2 additions & 2 deletions rust-nostd-esp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM espressif/idf-rust:all_1.72.0.0
FROM espressif/idf-rust:all_1.73.0.0

USER esp
ENV USER=esp

# Install extra crates
RUN cargo install cargo-audit && \
RUN cargo install cargo-audit@0.17.6 && \
GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \
curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-${GENERATE_VERSION}-x86_64-unknown-linux-gnu.tar.gz" -o "${HOME}/.cargo/bin/cargo-generate.tar.gz" && \
tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \
Expand Down
4 changes: 2 additions & 2 deletions rust-std-esp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM espressif/idf-rust:all_1.72.0.0
FROM espressif/idf-rust:all_1.73.0.0

USER esp
ENV USER=esp

# Install extra crates
RUN cargo install cargo-audit && \
RUN cargo install cargo-audit@0.17.6 && \
GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \
curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-${GENERATE_VERSION}-x86_64-unknown-linux-gnu.tar.gz" -o "${HOME}/.cargo/bin/cargo-generate.tar.gz" && \
tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \
Expand Down