From 860f75ee972f21144909cf1c8894859dfcefd264 Mon Sep 17 00:00:00 2001 From: Daniel Rainer Date: Mon, 12 Jan 2026 19:25:40 +0100 Subject: [PATCH] tarballs: append to cargo config This allows putting other configuration into the config file without it being deleted for tarballs. https://github.com/fish-shell/fish-shell/pull/12292#discussion_r2678697643 --- .cargo/config.toml | 5 +---- build_tools/make_vendor_tarball.sh | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index edbb8d030..8b1378917 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,4 +1 @@ -# This file is _not_ included in the tarballs for now -# Binary builds on Linux packaging infrastructure need to overwrite it to make `cargo vendor` work -# Releases and development builds made using OBS/Launchpad will _not_ reflect the contents of this -# file + diff --git a/build_tools/make_vendor_tarball.sh b/build_tools/make_vendor_tarball.sh index 0d3f7a28f..65012cf7d 100755 --- a/build_tools/make_vendor_tarball.sh +++ b/build_tools/make_vendor_tarball.sh @@ -43,7 +43,7 @@ PREFIX_TMPDIR=$(mktemp -d) cd "$PREFIX_TMPDIR" mkdir .cargo -cargo vendor --manifest-path "$wd/Cargo.toml" > .cargo/config.toml +cargo vendor --manifest-path "$wd/Cargo.toml" >> .cargo/config.toml tar cfvJ "$path".xz vendor .cargo