File tree Expand file tree Collapse file tree 2 files changed +2
-8
lines changed
Expand file tree Collapse file tree 2 files changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -144,7 +144,6 @@ jobs:
144144 sudo apt-get update
145145 sudo apt-get -y install debootstrap binfmt-support qemu-user-static u-boot-tools gcc-aarch64-linux-gnu
146146 rustup target add aarch64-unknown-linux-gnu
147- cargo +1.88 install cross --git https://github.com/cross-rs/cross --root /tmp/cross
148147
149148 - name : Build SD images
150149 run : |
Original file line number Diff line number Diff line change @@ -110,15 +110,10 @@ EOF
110110fi
111111
112112pushd out
113- git clone https://github.com/nextest-rs/nextest
114- pushd nextest
115- git fetch --tags
116- git checkout cargo-nextest-0.9.118
117- cross +1.90 build --target aarch64-unknown-linux-gnu --features=default-no-update --no-default-features --release
118- popd
113+ podman run --rm -v$PWD :/work-dir -w/work-dir ghcr.io/chipsalliance/caliptra-build-image:latest /bin/bash -c " rustup +1.90 target add aarch64-unknown-linux-gnu && CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc cargo +1.90 install cargo-nextest --version 0.9.118 --target aarch64-unknown-linux-gnu --target-dir /work-dir"
119114popd
120115
121- mv out/nextest/target/ aarch64-unknown-linux-gnu/release/cargo-nextest out/rootfs/usr/bin/
116+ mv out/aarch64-unknown-linux-gnu/release/cargo-nextest out/rootfs/usr/bin/
122117
123118chroot out/rootfs bash -c ' echo ::1 caliptra-fpga >> /etc/hosts'
124119cp startup-script.sh out/rootfs/usr/bin/
You can’t perform that action at this time.
0 commit comments