docker: Use specific msrv for stable toolchain.
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
@@ -38,21 +38,24 @@ cargo_feat_sets = {
|
||||
default = "brotli_compression,element_hacks,gzip_compression,io_uring,jemalloc,jemalloc_conf,media_thumbnail,release_max_log_level,systemd,url_preview,zstd_compression"
|
||||
all = "blurhashing,brotli_compression,tuwunel_mods,console,default,direct_tls,element_hacks,gzip_compression,hardened_malloc,io_uring,jemalloc,jemalloc_conf,jemalloc_prof,jemalloc_stats,ldap,media_thumbnail,perf_measurements,release_max_log_level,sentry_telemetry,systemd,tokio_console,url_preview,zstd_compression"
|
||||
}
|
||||
|
||||
variable "cargo_features_always" {
|
||||
default = "direct_tls"
|
||||
}
|
||||
|
||||
variable "feat_sets" {
|
||||
default = "[\"none\", \"default\", \"all\"]"
|
||||
}
|
||||
|
||||
variable "cargo_profiles" {
|
||||
default = "[\"test\", \"release\"]"
|
||||
}
|
||||
|
||||
variable "install_prefix" {
|
||||
default = "/usr"
|
||||
}
|
||||
|
||||
variable "rust_msrv" {
|
||||
default = "stable"
|
||||
}
|
||||
variable "rust_toolchains" {
|
||||
default = "[\"nightly\", \"stable\"]"
|
||||
}
|
||||
@@ -1455,7 +1458,10 @@ target "rust" {
|
||||
input = elem("target:rustup", [rust_target, sys_name, sys_version, sys_target])
|
||||
}
|
||||
args = {
|
||||
rust_toolchain = rust_toolchain
|
||||
rust_toolchain = (rust_toolchain == "stable"?
|
||||
rust_msrv: rust_toolchain
|
||||
)
|
||||
|
||||
rustup_components = join(" ", rustup_components)
|
||||
cargo_installs = join(" ", cargo_installs)
|
||||
|
||||
|
||||
@@ -59,6 +59,8 @@ docker_dir="$PWD/$BASEDIR"
|
||||
runner_name=$(echo $RUNNER_NAME | cut -d"." -f1)
|
||||
runner_num=$(echo $RUNNER_NAME | cut -d"." -f2)
|
||||
builder_name="${GITHUB_ACTOR:-owo}"
|
||||
toolchain_toml="$docker_dir/../rust-toolchain.toml"
|
||||
rust_msrv=$(grep "channel = " $toolchain_toml | cut -d'=' -f2 | sed 's/\s"\|"$//g')
|
||||
rocksdb_opt_level=3
|
||||
rocksdb_portable=1
|
||||
git_checkout="HEAD"
|
||||
|
||||
Reference in New Issue
Block a user