tyler.durden
/
rpm-icinga2
mirror of https://git.icinga.com/packaging/rpm-icinga2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get_snapshot: Use UPSTREAM_GIT_BRANCH instead of HEAD

This commit is contained in:
Markus Frosch 2017-06-07 15:21:25 +02:00
parent f5783f2183
commit 4e7d27a0d4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
get_snapshot
View File

@ -54,11 +54,11 @@ 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}"
# creating version file for tarball # creating version file for tarball
mkdir "${PROJECT}-${package_version}" mkdir "${PROJECT}-${package_version}"
@ -71,4 +71,4 @@ 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"