yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 22:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:RiV-chain/RiV-mesh into develop

Browse source
This commit is contained in:
Mihail Slobodyanuk 2022-12-12 11:00:28 +02:00
commit 8cace274d0
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build
View file

@ -4,6 +4,8 @@ set -ef
PKGSRC=${PKGSRC:-github.com/RiV-chain/RiV-mesh/src/version} PKGSRC=${PKGSRC:-github.com/RiV-chain/RiV-mesh/src/version}
PKGNAME=${PKGNAME:-$(sh contrib/semver/name.sh)} PKGNAME=${PKGNAME:-$(sh contrib/semver/name.sh)}
PKGVER=${PKGVER:-$(sh contrib/semver/version.sh --bare)} PKGVER=${PKGVER:-$(sh contrib/semver/version.sh --bare)}
echo "Building: $PKGVER"
if [ "$LDFLAGS" ]; then if [ "$LDFLAGS" ]; then
LDFLAGS="$LDFLAGS -X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER" LDFLAGS="$LDFLAGS -X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER"
else else

4
contrib/semver/version.sh
View file

@ -3,9 +3,9 @@
case "$*" in case "$*" in
*--bare*) *--bare*)
# Remove the "v" prefix # Remove the "v" prefix
git describe --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" | cut -c 2- git describe --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" --abbrev=7 | cut -c 2-
;; ;;
*) *)
git describe --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" git describe --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" --abbrev=7
;; ;;
esac esac