Skip to content

Commit cd47a91

Browse files
committed
fix: use rust 1.91.1 for simulator
1 parent 0896762 commit cd47a91

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

l2/_simulator/mkosi.build

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ TDX_QUOTE_PROVIDER_REF=$(mkosi-chroot yq -r '.tdx_quote_provider.git_reference'
1313
source scripts/make_git_package.sh
1414
source scripts/build_rust_package.sh
1515

16+
export CARGO_HOME="/cargo"
17+
export RUSTUP_HOME="/rustup"
18+
export PATH="$CARGO_HOME/bin:$PATH"
19+
RUST_VERSION=$(mkosi-chroot yq -r '.rust.version' < "$ENV_YAML")
20+
mkosi-chroot rustup toolchain install $RUST_VERSION
21+
mkosi-chroot rustup default $RUST_VERSION
22+
1623
# build simulator
1724

1825
build_rust_package \

l2/_simulator/mkosi.conf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ PostInstallationScripts=l2/_simulator/mkosi.postinst
99
Packages=sudo
1010
unzip
1111

12-
BuildPackages=cargo/trixie-backports
13-
golang
12+
BuildPackages=golang
1413
libssl-dev
15-
rustc/trixie-backports
14+
rustup
1615
unzip
1716
yq

l2/_simulator/mkosi.extra/etc/flashbots/simulator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ simulator:
66
git_reference: v0.0.1-dev.1
77
rproxy:
88
git_reference: v0.0.10-dev.7
9+
rust:
10+
version: 1.91.1

0 commit comments

Comments
 (0)