From aa1b64f95583160bb605cff8668fed08e73f8750 Mon Sep 17 00:00:00 2001 From: David Adam Date: Wed, 17 Sep 2025 13:56:17 +0800 Subject: [PATCH] build_tools: make tarball scripts use the build version --- build_tools/make_tarball.sh | 4 ++-- build_tools/make_vendor_tarball.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tools/make_tarball.sh b/build_tools/make_tarball.sh index 098ff3641..246e6394d 100755 --- a/build_tools/make_tarball.sh +++ b/build_tools/make_tarball.sh @@ -39,8 +39,8 @@ fi # Get the current directory, which we'll use for symlinks wd="$PWD" -# Get the version from git-describe -VERSION=$(git describe --dirty 2>/dev/null) +# Get the version +VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null) # The name of the prefix, which is the directory that you get when you untar prefix="fish-$VERSION" diff --git a/build_tools/make_vendor_tarball.sh b/build_tools/make_vendor_tarball.sh index e3b8c85b4..33db06653 100755 --- a/build_tools/make_vendor_tarball.sh +++ b/build_tools/make_vendor_tarball.sh @@ -26,7 +26,7 @@ fi wd="$PWD" # Get the version from git-describe -VERSION=$(git describe --dirty 2>/dev/null) +VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null) # The name of the prefix, which is the directory that you get when you untar prefix="fish-$VERSION"