mirror of
https://git.icinga.com/packaging/rpm-icingaweb2.git
synced 2025-07-28 16:34:06 +02:00
get_snapshot: Use UPSTREAM_GIT_BRANCH instead of HEAD
This commit is contained in:
parent
a4543cb1c2
commit
df902f3daf
@ -54,15 +54,15 @@ else
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git_version=$(git describe --tags HEAD)
|
git_version=$(git describe --tags "${UPSTREAM_GIT_BRANCH}")
|
||||||
package_version=$(echo "$git_version" | sed -e 's/^v//' -e 's/-/./g')
|
package_version=$(echo "$git_version" | sed -e 's/^v//' -e 's/-/./g')
|
||||||
tarball="${workdir}/${PROJECT}-${package_version}.tar"
|
tarball="${workdir}/${PROJECT}-${package_version}.tar"
|
||||||
|
|
||||||
git archive --format=tar --prefix="${PROJECT}-${package_version}/" -o "${tarball}" HEAD
|
git archive --format=tar --prefix="${PROJECT}-${package_version}/" -o "${tarball}" "${UPSTREAM_GIT_BRANCH}"
|
||||||
|
|
||||||
# pack tarball
|
# pack tarball
|
||||||
gzip -vf9 "${tarball}"
|
gzip -vf9 "${tarball}"
|
||||||
sha256sum "${tarball}.gz"
|
sha256sum "${tarball}.gz"
|
||||||
|
|
||||||
# store package version for build scripts
|
# store package version for build scripts
|
||||||
echo -e "${package_version}\t$(git rev-parse HEAD)\t$(basename "${tarball}.gz")\t${UPSTREAM_GIT_BRANCH}" > "${workdir}/${PROJECT}.version"
|
echo -e "${package_version}\t$(git rev-parse "${UPSTREAM_GIT_BRANCH}")\t$(basename "${tarball}.gz")\t${UPSTREAM_GIT_BRANCH}" > "${workdir}/${PROJECT}.version"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user