Skip to content

Commit 68fa63a

Browse files
Repo File Sync: Update rust version and rust tool versions in container. (#449)
synced local file(s) with [microsoft/mu_devops](https://github.com/microsoft/mu_devops). 🤖: View the [Repo File Sync Configuration File](https://github.com/microsoft/mu_devops/blob/main/.sync/Files.yml) to see how files are synced. --- This PR was created automatically by the [repo-file-sync-action](https://github.com/BetaHuhn/repo-file-sync-action) workflow run [#15356001445](https://github.com/microsoft/mu_devops/actions/runs/15356001445) Signed-off-by: Project Mu UEFI Bot <uefibot@microsoft.com> Co-authored-by: mu-automation[bot] <204385837+mu-automation[bot]@users.noreply.github.com>
1 parent 49e1d62 commit 68fa63a

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

Containers/Ubuntu-22/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,18 @@ ENV RUSTUP_HOME="$HOME/.rustup"
118118
ENV PATH="$CARGO_HOME/bin:$PATH"
119119

120120
# Install Rust/Cargo and extras (rust-src, rust fmt, cargo-make, cargo-tarpaulin)
121-
RUN VERSION_URL="https://raw.githubusercontent.com/microsoft/mu_devops/main/.sync/Version.njk" && \
122-
RUST_VERSION=$(curl -s ${VERSION_URL} | grep -oP '(?<=rust_toolchain = ").*(?=")') && \
121+
RUN RUST_VERSION=1.85.0 && \
123122
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${RUST_VERSION} --profile minimal && \
124123
rustup component add rustfmt rust-src --toolchain ${RUST_VERSION}-x86_64-unknown-linux-gnu
125124

126125
RUN mkdir cargo_downloads && \
127126
cd cargo_downloads && \
128-
TAG_NAME=$(curl -s https://api.github.com/repos/sagiegurari/cargo-make/releases/latest | jq -r '.tag_name') && \
127+
TAG_NAME=0.37.24 && \
129128
DOWNLOAD_URL="https://github.com/sagiegurari/cargo-make/releases/download/$TAG_NAME/cargo-make-v$TAG_NAME-x86_64-unknown-linux-gnu.zip" && \
130129
curl -L -o cargo-make.zip "$DOWNLOAD_URL" && \
131130
unzip cargo-make.zip && \
132131
mv cargo-make-v$TAG_NAME-x86_64-unknown-linux-gnu/cargo-make $CARGO_HOME/bin/ && \
133-
TAG_NAME=$(curl -s https://api.github.com/repos/xd009642/tarpaulin/releases/latest | jq -r '.tag_name') && \
132+
TAG_NAME=0.31.5 && \
134133
DOWNLOAD_URL="https://github.com/xd009642/tarpaulin/releases/download/$TAG_NAME/cargo-tarpaulin-x86_64-unknown-linux-gnu.tar.gz" && \
135134
curl -L -o cargo-tarpaulin.tar.gz "$DOWNLOAD_URL" && \
136135
tar -xzvf cargo-tarpaulin.tar.gz && \

Containers/Ubuntu-24/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,18 @@ ENV RUSTUP_HOME="$HOME/.rustup"
115115
ENV PATH="$CARGO_HOME/bin:$PATH"
116116

117117
# Install Rust/Cargo and extras (rust-src, rust fmt, cargo-make, cargo-tarpaulin)
118-
RUN VERSION_URL="https://raw.githubusercontent.com/microsoft/mu_devops/main/.sync/Version.njk" && \
119-
RUST_VERSION=$(curl -s ${VERSION_URL} | grep -oP '(?<=rust_toolchain = ").*(?=")') && \
118+
RUN RUST_VERSION=1.85.0 && \
120119
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${RUST_VERSION} --profile minimal && \
121120
rustup component add rustfmt rust-src --toolchain ${RUST_VERSION}-x86_64-unknown-linux-gnu
122121

123122
RUN mkdir cargo_downloads && \
124123
cd cargo_downloads && \
125-
TAG_NAME=$(curl -s https://api.github.com/repos/sagiegurari/cargo-make/releases/latest | jq -r '.tag_name') && \
124+
TAG_NAME=0.37.24 && \
126125
DOWNLOAD_URL="https://github.com/sagiegurari/cargo-make/releases/download/$TAG_NAME/cargo-make-v$TAG_NAME-x86_64-unknown-linux-gnu.zip" && \
127126
curl -L -o cargo-make.zip "$DOWNLOAD_URL" && \
128127
unzip cargo-make.zip && \
129128
mv cargo-make-v$TAG_NAME-x86_64-unknown-linux-gnu/cargo-make $CARGO_HOME/bin/ && \
130-
TAG_NAME=$(curl -s https://api.github.com/repos/xd009642/tarpaulin/releases/latest | jq -r '.tag_name') && \
129+
TAG_NAME=0.31.5 && \
131130
DOWNLOAD_URL="https://github.com/xd009642/tarpaulin/releases/download/$TAG_NAME/cargo-tarpaulin-x86_64-unknown-linux-gnu.tar.gz" && \
132131
curl -L -o cargo-tarpaulin.tar.gz "$DOWNLOAD_URL" && \
133132
tar -xzvf cargo-tarpaulin.tar.gz && \

0 commit comments

Comments
 (0)