studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ci: Add multi-runner/multi-arch to matrices. (closes #55)

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-06-16 03:19:34 +00:00
parent fc3fcf4526
commit 83ceda808c
9 changed files with 172 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile.rocksdb
View File

@@ -29,7 +29,7 @@ ARG rocksdb_shared=0
ARG rocksdb_portable=1
ARG rocksdb_opt_level="3"
ARG rocksdb_build_type="Release"
ARG rocksdb_cxx_flags="-ftls-model=initial-exec"
ARG rocksdb_cxx_flags="-ftls-model=initial-exec -mno-outline-atomics"
ARG rocksdb_make_verbose="ON"
ARG rocksdb_make_rule_messages="OFF"
ARG rocksdb_jemalloc=1

5
docker/Dockerfile.rust
View File

@@ -3,7 +3,7 @@
FROM input AS rustup
ARG RUST_HOME
ARG rust_target
ARG rustup_version="1.28.1"
ARG rustup_version="1.28.2"
ARG rustup_profile="minimal"
WORKDIR /
@@ -13,7 +13,8 @@ WORKDIR ${RUST_HOME}
RUN <<EOF
set -eux
url="https://static.rust-lang.org/rustup/archive/${rustup_version}/${rust_target}/rustup-init"
var="${rustup_version}/${rust_target}"
url="https://static.rust-lang.org/rustup/archive/$var/rustup-init"
curl -S -O -s "$url"
chmod o+x rustup-init
EOF

87
docker/bake.hcl
View File

@@ -156,7 +156,33 @@ variable "git_checkout" {
# Rustflags
#
rustflags = []
rustflags = [
"-C link-arg=--verbose",
"-C link-arg=-Wl,--gc-sections",
]
static_rustflags = [
"-C relocation-model=static",
"-C target-feature=+crt-static",
]
static_libs = [
"-C link-arg=-l:libstdc++.a",
"-C link-arg=-l:libc.a",
"-C link-arg=-l:libm.a",
]
dynamic_rustflags = [
"-C relocation-model=pic",
"-C target-feature=-crt-static",
"-C link-arg=-Wl,--as-needed",
]
dynamic_libs = [
"-C link-arg=-lstdc++",
"-C link-arg=-lc",
"-C link-arg=-lm",
]
nightly_rustflags = [
"--cfg tokio_unstable",
@@ -168,33 +194,11 @@ nightly_rustflags = [
#"-Z time-llvm-passes",
]
static_rustflags = [
"-C relocation-model=static",
"-C target-feature=+crt-static",
"-C link-arg=--verbose",
"-C link-arg=-Wl,--gc-sections",
"-C link-arg=-L/usr/lib/gcc/x86_64-linux-gnu/14", # FIXME
"-C link-arg=-l:libstdc++.a",
"-C link-arg=-l:libc.a",
"-C link-arg=-l:libm.a",
]
dynamic_rustflags = [
"-C relocation-model=pic",
"-C target-feature=-crt-static",
"-C link-arg=--verbose",
"-C link-arg=-Wl,--gc-sections",
"-C link-arg=-Wl,--as-needed",
"-C link-arg=-lstdc++",
"-C link-arg=-lc",
"-C link-arg=-lm",
]
static_nightly_rustflags = [
"-Z tls-model=local-exec",
]
rmp_rustflags = [
native_rustflags = [
"-C target-cpu=native",
"-Z tune-cpu=native",
"-Z inline-mir=true",
@@ -1188,56 +1192,73 @@ target "deps-base" {
join(" ", [
join(" ", rustflags),
join(" ", nightly_rustflags),
join(" ", static_rustflags),
join(" ", static_nightly_rustflags),
join(" ", native_rustflags),
"-C link-arg=-L/usr/lib/gcc/${sys_target}/14", #FIXME
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-C link-arg=-l:libzstd.a": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-C link-arg=-l:liburing.a": "",
join(" ", static_rustflags),
join(" ", static_nightly_rustflags),
join(" ", rmp_rustflags),
join(" ", static_libs),
sys_target == "aarch64-linux-gnu"?
"-C link-arg=-l:libgcc.a": "",
]):
cargo_profile == "release" && rust_toolchain == "nightly"?
join(" ", [
join(" ", rustflags),
join(" ", nightly_rustflags),
join(" ", static_rustflags),
join(" ", static_nightly_rustflags),
"-C link-arg=-L/usr/lib/gcc/${sys_target}/14", #FIXME
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-C link-arg=-l:libzstd.a": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-C link-arg=-l:liburing.a": "",
join(" ", static_rustflags),
join(" ", static_nightly_rustflags),
join(" ", static_libs),
sys_target == "aarch64-linux-gnu"?
"-C link-arg=-l:libgcc.a": "",
]):
cargo_profile == "release" || cargo_profile == "release-debuginfo"?
join(" ", [
join(" ", rustflags),
join(" ", static_rustflags),
"-C link-arg=-L/usr/lib/gcc/${sys_target}/14", #FIXME
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-C link-arg=-l:libzstd.a": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-C link-arg=-l:liburing.a": "",
join(" ", static_rustflags),
join(" ", static_libs),
sys_target == "aarch64-linux-gnu"?
"-C link-arg=-l:libgcc.a": "",
]):
rust_toolchain == "stable"?
join(" ", [
join(" ", rustflags),
join(" ", static_rustflags),
"-C link-arg=-L/usr/lib/gcc/${sys_target}/14", #FIXME
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-C link-arg=-l:libzstd.a": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-C link-arg=-l:liburing.a": "",
join(" ", static_rustflags),
join(" ", static_libs),
sys_target == "aarch64-linux-gnu"?
"-C link-arg=-l:libgcc.a": "",
]):
rust_toolchain == "nightly"?
join(" ", [
join(" ", rustflags),
join(" ", nightly_rustflags),
join(" ", dynamic_rustflags),
contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?
"-C link-arg=-lzstd": "",
contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
"-C link-arg=-luring": "",
join(" ", dynamic_rustflags),
join(" ", dynamic_libs),
]):
join(" ", [
@@ -1429,7 +1450,7 @@ cargo_installs = [
"cargo-chef",
"cargo-audit",
"cargo-deb",
"cargo-arch",
#"cargo-arch",
"cargo-generate-rpm",
"lychee",
"mdbook",