Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Containers/Ubuntu-22/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ ENV RUSTUP_HOME="$HOME/.rustup"
ENV PATH="$CARGO_HOME/bin:$PATH"

# Install Rust/Cargo and extras (rust-src, rust fmt, cargo-make, cargo-tarpaulin)
RUN RUST_VERSION=1.89.0 && \
RUN RUST_VERSION=1.92.0 && \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${RUST_VERSION} --profile minimal && \
rustup component add rustfmt rust-src --toolchain ${RUST_VERSION}-x86_64-unknown-linux-gnu

Expand Down
2 changes: 1 addition & 1 deletion Containers/Ubuntu-24/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ ENV RUSTUP_HOME="$HOME/.rustup"
ENV PATH="$CARGO_HOME/bin:$PATH"

# Install Rust/Cargo and extras (rust-src, rust fmt, cargo-make, cargo-tarpaulin)
RUN RUST_VERSION=1.89.0 && \
RUN RUST_VERSION=1.92.0 && \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${RUST_VERSION} --profile minimal && \
rustup component add rustfmt rust-src --toolchain ${RUST_VERSION}-x86_64-unknown-linux-gnu

Expand Down
10 changes: 5 additions & 5 deletions Steps/RustSetupSteps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ steps:
# those on both Linux and Windows agents for consistency in the pipeline runs.
#
- script: |
rustup install --no-self-update 1.89.0
displayName: Install Rust 1.89.0 (Windows)
rustup install --no-self-update 1.92.0
displayName: Install Rust 1.92.0 (Windows)
condition: eq(variables['Agent.OS'], 'Windows_NT')

- script: |
rustup default 1.89.0
displayName: Set Rust 1.89.0 (Windows)
rustup default 1.92.0
displayName: Set Rust 1.92.0 (Windows)
condition: eq(variables['Agent.OS'], 'Windows_NT')

- script: pip install requests --upgrade
Expand Down Expand Up @@ -130,6 +130,6 @@ steps:
cargo binstall -y cargo-tarpaulin --version 0.31.5
displayName: Install cargo-tarpaulin

- script: rustup component add rustfmt rust-src --toolchain 1.89.0-$(rust_target_triple)
- script: rustup component add rustfmt rust-src --toolchain 1.92.0-$(rust_target_triple)
displayName: rustup add rust-src
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))