Skip to content

Commit

Permalink
build.sh: Fix tarball name
Browse files Browse the repository at this point in the history
'meson dist' produces tarball name based on the latest tag,
not on the date of run.

Fixes: 2e8b3b2 ("build.sh: Add support for meson dist")
Fixes: 6d1f6e0 ("build.sh: Fix testing release build")
Signed-off-by: Petr Vorel <[email protected]>
  • Loading branch information
pevik committed Oct 18, 2024
1 parent 11fef29 commit 7872b97
Showing 1 changed file with 26 additions and 1 deletion.
27 changes: 26 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,37 @@ install()
dist()
{
local formats="xztar,gztar,zip"
local tag="$(date +%Y%m%d)"
local tag="$(git describe --abbrev=0)"
local f

# FIXME: debug
git --version
echo "tag: '$tag'"
echo "date: '$(date +%Y%m%d)'"

echo "=== pwd ('$PWD') ==="
pwd
echo
# FIXME: debug

echo "=== dist ($formats) ==="
meson dist -C $BUILD_DIR --formats $formats

# FIXME: debug
echo "ret: $?"
echo
echo "=== pwd ('$PWD') ==="
pwd
echo

echo "=== find $BUILD_DIR ==="
find $BUILD_DIR
echo

#echo "ls $BUILD_DIR/meson-dist/"
#ls -lah $BUILD_DIR/meson-dist/
# FIXME: debug

for f in $(echo "$formats" | sed 's/,/ /g'); do
f=$(echo "$f" | sed 's/\(.*\)tar/tar.\1/')
f=$BUILD_DIR/meson-dist/iputils-$tag.$f
Expand Down

0 comments on commit 7872b97

Please sign in to comment.