Use new cross image with stable cross binary

Author: michaelsproul

Cross.toml

@@ -6,6 +6,8 @@ pre-build = ["apt-get install -y cmake clang-5.0"]
 
 [target.riscv64gc-unknown-linux-gnu]
 pre-build = ["apt-get install -y cmake clang"]
+# Use the most recent Cross image for RISCV because the stable 0.2.5 image doesn't work
+image = "ghcr.io/cross-rs/riscv64gc-unknown-linux-gnu:main"
 
 # Allow setting page size limits for jemalloc at build time:
 # For certain architectures (like aarch64), we must compile

Makefile

@@ -70,8 +70,6 @@ build-aarch64:
 	# See: https://github.com/sigp/lighthouse/issues/5244
 	JEMALLOC_SYS_WITH_LG_PAGE=16 cross build --bin lighthouse --target aarch64-unknown-linux-gnu --features "portable,$(CROSS_FEATURES)" --profile "$(CROSS_PROFILE)" --locked
 build-riscv64:
-	# cross release v0.2.5 is to old, build from sources 
-	cargo install cross --git https://github.com/cross-rs/cross 
 	cross build --bin lighthouse --target riscv64gc-unknown-linux-gnu --features "portable,$(CROSS_FEATURES)" --profile "$(CROSS_PROFILE)" --locked
 
 build-lcli-x86_64:
@@ -82,8 +80,6 @@ build-lcli-aarch64:
 	# See: https://github.com/sigp/lighthouse/issues/5244
 	JEMALLOC_SYS_WITH_LG_PAGE=16 cross build --bin lcli --target aarch64-unknown-linux-gnu --features "portable" --profile "$(CROSS_PROFILE)" --locked
 build-lcli-riscv64:
-	# cross release v0.2.5 is to old, build from sources
-	cargo install cross --git https://github.com/cross-rs/cross
 	cross build --bin lcli --target riscv64gc-unknown-linux-gnu --features "portable" --profile "$(CROSS_PROFILE)" --locked
 
 # Create a `.tar.gz` containing a binary for a specific target.