gitlab-ci: Remove GitLab CI 'git describe' bug workaround
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
This commit is contained in:
parent
7f53a873d6
commit
c7fa9ffe65
|
@ -75,10 +75,7 @@ debian:
|
||||||
script:
|
script:
|
||||||
- mk-build-deps -i -r -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y"
|
- mk-build-deps -i -r -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y"
|
||||||
- PACKAGE_VERSION="$CI_COMMIT_TAG"
|
- PACKAGE_VERSION="$CI_COMMIT_TAG"
|
||||||
# Workaround for GitLab CI bug (see https://gitlab.com/gitlab-org/gitlab-ce/issues/61007)
|
- PACKAGE_VERSION="${PACKAGE_VERSION:-$(git describe --abbrev=8 2>/dev/null | tr '-' '+' | cut -c '2-' || true)}"
|
||||||
# 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#v}"
|
- PACKAGE_VERSION="${PACKAGE_VERSION#v}"
|
||||||
- |
|
- |
|
||||||
[ -z "$PACKAGE_VERSION" ] || {
|
[ -z "$PACKAGE_VERSION" ] || {
|
||||||
|
|
Loading…
Reference in New Issue