gitlab-ci: Remove GitLab CI 'git describe' bug workaround

Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
This commit is contained in:
Vasilis Tsiligiannis 2019-12-21 13:41:35 +02:00
parent 7f53a873d6
commit c7fa9ffe65
1 changed files with 1 additions and 4 deletions

View File

@ -75,10 +75,7 @@ debian:
script:
- mk-build-deps -i -r -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y"
- PACKAGE_VERSION="$CI_COMMIT_TAG"
# Workaround for GitLab CI bug (see https://gitlab.com/gitlab-org/gitlab-ce/issues/61007)
# On issue fix, replace with:
# - PACKAGE_VERSION="${PACKAGE_VERSION:-$(git describe --abbrev=8 2>/dev/null | tr '-' '+' | cut -c '2-' || true)}"
- PACKAGE_VERSION="${PACKAGE_VERSION:-0.0+1+g$CI_COMMIT_SHORT_SHA}"
- PACKAGE_VERSION="${PACKAGE_VERSION:-$(git describe --abbrev=8 2>/dev/null | tr '-' '+' | cut -c '2-' || true)}"
- PACKAGE_VERSION="${PACKAGE_VERSION#v}"
- |
[ -z "$PACKAGE_VERSION" ] || {