Always rebase on pull in .drone.yml.

This commit is contained in:
Fabio Manganiello 2023-09-04 02:53:20 +02:00
parent 82ef928d5b
commit 6ee064cb89
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774

View file

@ -177,7 +177,7 @@ steps:
- echo "--- Parsing metadata" - echo "--- Parsing metadata"
- git config --global --add safe.directory $PWD - git config --global --add safe.directory $PWD
- git pull origin master --tags - git pull --rebase origin master --tags
- export VERSION=$(python setup.py --version) - export VERSION=$(python setup.py --version)
- export HEAD=$(git log | head -1 | awk '{printf "%.8s", $2}') - export HEAD=$(git log | head -1 | awk '{printf "%.8s", $2}')
- export GIT_VERSION="$VERSION.r$(git log --pretty=oneline HEAD...v$VERSION | wc -l).$HEAD" - export GIT_VERSION="$VERSION.r$(git log --pretty=oneline HEAD...v$VERSION | wc -l).$HEAD"