fix pkgver calculation
This commit is contained in:
parent
1d627aee7f
commit
188e57bc74
|
@ -16,17 +16,17 @@ tasks:
|
||||||
cd /home/build/trifid
|
cd /home/build/trifid
|
||||||
|
|
||||||
describe=$(git describe)
|
describe=$(git describe)
|
||||||
if [[ $describe == tfclient* ]]; then
|
|
||||||
project=tfclient
|
|
||||||
fi
|
|
||||||
if [[ $describe == tfcli* ]]; then
|
if [[ $describe == tfcli* ]]; then
|
||||||
project=tfcli
|
project=tfcli
|
||||||
fi
|
fi
|
||||||
|
if [[ $describe == tfclient* ]]; then
|
||||||
|
project=tfclient
|
||||||
|
fi
|
||||||
if [[ $describe == trifid-api* ]]; then
|
if [[ $describe == trifid-api* ]]; then
|
||||||
project=trifid-api
|
project=trifid-api
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pkgver=$(git describe | sed -e 's/$project-v//g' | sed -e 's/-/_/g')
|
pkgver=$(git describe | sed -e "s/$project-v//g" | sed -e 's/-/_/g')
|
||||||
|
|
||||||
echo "project=$project" >> ~/.buildenv
|
echo "project=$project" >> ~/.buildenv
|
||||||
echo "pkgver=$pkgver" >> ~/.buildenv
|
echo "pkgver=$pkgver" >> ~/.buildenv
|
||||||
|
|
Loading…
Reference in New Issue