From 00102c42764efd613f7b786b3995ec29a8020aa9 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sun, 31 Aug 2025 02:18:59 +0000 Subject: [PATCH] ci: Skip unnecessary amd64 -v2 and -v3 builds in test-profile mode. docker: Use env override for git_checkout. Signed-off-by: Jason Volk --- .github/workflows/test.yml | 3 ++- docker/bake.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 60188bd5..89ae919e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -92,7 +92,8 @@ jobs: {"cargo_profile": "test", "feat_set": "none", "bake_target": "smoke-valgrind"}, {"cargo_profile": "test", "rust_toolchain": "stable"}, {"cargo_profile": "test", "rust_target": "aarch64-unknown-linux-gnu"}, - {"cargo_profile": "test", "sys_target": "x86_64-v2-linux-gnu", "bake_target": "smoke-valgrind"}, + {"cargo_profile": "test", "sys_target": "x86_64-v2-linux-gnu"}, + {"cargo_profile": "test", "sys_target": "x86_64-v3-linux-gnu"}, {"cargo_profile": "release", "rust_toolchain": "nightly"}, {"cargo_profile": "release", "rust_toolchain": "stable", "feat_set": "none"}, {"cargo_profile": "release", "bake_target": "smoke-valgrind"}, diff --git a/docker/bake.sh b/docker/bake.sh index 682c1cb3..e869c20f 100755 --- a/docker/bake.sh +++ b/docker/bake.sh @@ -61,7 +61,7 @@ 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" +git_checkout="${git_checkout:-HEAD}" use_chef="true" set +a