Skip to content

Commit

Permalink
better and more consistent semver
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-mangin committed Jul 15, 2024
1 parent b26ae7e commit c03dee9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.remote
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN echo "user = 'exa'" >> /opt/exabgp/etc/exabgp/exabgp.env
RUN cd /tmp \
&& echo Building ${version} \
&& pip install -U setuptools \
&& env EXABGP_VERSION=`date +%Y.%m.%d` pip install git+https://github.com/Exa-Networks/exabgp.git@${version}
&& env EXABGP_VERSION=5.0.0-`date +%Y%m%d`+uncontrolled pip install git+https://github.com/Exa-Networks/exabgp.git@${version}

WORKDIR /etc/exabgp

Expand Down
4 changes: 2 additions & 2 deletions sbin/exabgp
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ if [ $? -eq 0 ]; then
if [ $GIT_TAG -eq 0 ]; then
GIT_BRANCH=`git branch | grep "*" | awk '{ print $2}'`
GIT_COMMIT=`git rev-parse --short=10 HEAD`
export EXABGP_VERSION="$(date +%Y.%m.%d)-${GIT_BRANCH}-${GIT_COMMIT}"
export EXABGP_VERSION="5.0.0-$(date +%Y%m%d)+${GIT_BRANCH}-${GIT_COMMIT}"
fi
else
export EXABGP_VERSION="$(date -r $0 +%Y.%m.%d)-uncontrolled"
export EXABGP_VERSION="5.0.0-$(date -r $0 +%Y%m%d)+uncontrolled"
fi


Expand Down
2 changes: 1 addition & 1 deletion src/exabgp/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from datetime import datetime

commit = "99de31e8"
release = "5.0.0dev%s" % datetime.now().strftime('%Y%m%d%H%M%S')
release = "5.0.0-%s+uncontrolled" % datetime.now().strftime('%Y%m%d')
json = "5.0.0"
text = "5.0.0"
version = os.environ.get('EXABGP_VERSION', release)
Expand Down

0 comments on commit c03dee9

Please sign in to comment.