From 995077eea7a36dfa1daae02f8ad7a03b0858f560 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Tue, 26 Dec 2023 04:37:05 +0100 Subject: [PATCH] [CI/CD] Fixed off-by-one version number issue. --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 525cb50003..883539066c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -372,7 +372,7 @@ steps: - git config --global --add safe.directory $PWD - git pull --rebase origin master --tags - export VERSION=$(python3 setup.py --version) - - export GIT_VERSION="$VERSION-$(( $(git log --pretty=oneline HEAD...v$VERSION | wc -l) + 1))" + - export GIT_VERSION="$VERSION-$(git log --pretty=oneline HEAD...v$VERSION | wc -l)" - export GIT_BUILD_DIR="$WORKDIR/$${PKG_NAME}_$${GIT_VERSION}_all" - export GIT_DEB="$WORKDIR/$${PKG_NAME}_$${GIT_VERSION}_all.deb" - export POOL_PATH="$APT_ROOT/pool/$DEB_VERSION/dev" @@ -464,7 +464,7 @@ steps: - git config --global --add safe.directory $PWD - git pull --rebase origin master --tags - export VERSION=$(python3 setup.py --version) - - export GIT_VERSION="$VERSION-$(( $(git log --pretty=oneline HEAD...v$VERSION | wc -l) + 1))" + - export GIT_VERSION="$VERSION-$(git log --pretty=oneline HEAD...v$VERSION | wc -l)" - export GIT_BUILD_DIR="$WORKDIR/$${PKG_NAME}_$${GIT_VERSION}_all" - export GIT_DEB="$WORKDIR/$${PKG_NAME}_$${GIT_VERSION}_all.deb" - export POOL_PATH="$APT_ROOT/pool/$DEB_VERSION/dev" @@ -765,7 +765,7 @@ steps: - git config --global --add safe.directory $PWD - git pull --rebase origin master --tags - export VERSION=$(python3 setup.py --version) - - export RELNUM=$(git log --pretty=oneline HEAD...v$VERSION | wc -l) + - export RELNUM="$(git log --pretty=oneline HEAD...v$VERSION | wc -l)" - export SPECFILE="$WORKDIR/$PKG_NAME.spec" - export BUILD_DIR="$WORKDIR/build" - export TMP_RPM_ROOT="$WORKDIR/repo"