Skip to content
Snippets Groups Projects
Commit 4e7d27a0 authored by Markus Frosch's avatar Markus Frosch
Browse files

get_snapshot: Use UPSTREAM_GIT_BRANCH instead of HEAD

parent f5783f21
No related branches found
No related tags found
No related merge requests found
......@@ -54,11 +54,11 @@ else
exit 1
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')
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
mkdir "${PROJECT}-${package_version}"
......@@ -71,4 +71,4 @@ gzip -vf9 "${tarball}"
sha256sum "${tarball}.gz"
# 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"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment