Commit 89b3549e authored by eric pellegrini's avatar eric pellegrini

Merge branch 'release-1.0.8'

parents b184c285 3e031f44
Pipeline #1518 passed with stages
in 19 minutes and 33 seconds
...@@ -17,7 +17,7 @@ BUILD_TARGET=darwin ...@@ -17,7 +17,7 @@ BUILD_TARGET=darwin
echo -e "$BLEU""Getting last MDANSE revision" "$NORMAL" echo -e "$BLEU""Getting last MDANSE revision" "$NORMAL"
# Update the __pkginfo__ file with the current commit. The sed -i "" is compulsory other crashes on macos # Update the __pkginfo__ file with the current commit. The sed -i "" is compulsory other crashes on macos
COMMIT_ID=$(git rev-parse --long HEAD) COMMIT_ID=$(git rev-parse HEAD)
sed -i "" "s/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/" MDANSE/__pkginfo__.py sed -i "" "s/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/" MDANSE/__pkginfo__.py
# Get revision number from git (without trailing newline) # Get revision number from git (without trailing newline)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
ROUGE="\\033[1;31m" ROUGE="\\033[1;31m"
BLEU="\\033[1;34m" BLEU="\\033[1;34m"
COMMIT_ID=$(git rev-parse --long HEAD) COMMIT_ID=$(git rev-parse HEAD)
VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py` VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
if [[ ${CI_BUILD_REF_NAME} =~ develop ]] if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
......
...@@ -14,7 +14,7 @@ cd ...@@ -14,7 +14,7 @@ cd
cd $CI_PROJECT_DIR cd $CI_PROJECT_DIR
# Update the __pkginfo__ file with the current commit # Update the __pkginfo__ file with the current commit
COMMIT_ID=$(git rev-parse --long HEAD) COMMIT_ID=$(git rev-parse HEAD)
sed -i "s/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/" MDANSE/__pkginfo__.py sed -i "s/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/" MDANSE/__pkginfo__.py
# Get revision number from git (without trailing newline) # Get revision number from git (without trailing newline)
......
...@@ -11,7 +11,7 @@ export DISTRO=$2 ...@@ -11,7 +11,7 @@ export DISTRO=$2
ROUGE="\\033[1;31m" ROUGE="\\033[1;31m"
BLEU="\\033[1;34m" BLEU="\\033[1;34m"
COMMIT_ID=$(git rev-parse --long HEAD) COMMIT_ID=$(git rev-parse HEAD)
VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py` VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
if [[ ${CI_BUILD_REF_NAME} =~ develop ]] if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
......
...@@ -195,7 +195,7 @@ rm pythonlog.txt ...@@ -195,7 +195,7 @@ rm pythonlog.txt
cd ${CI_PROJECT_DIR} cd ${CI_PROJECT_DIR}
# Update the __pkginfo__ file with the current commit # Update the __pkginfo__ file with the current commit
COMMIT_ID=$(git rev-parse --long HEAD) COMMIT_ID=$(git rev-parse HEAD)
sed -i "s/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/" MDANSE/__pkginfo__.py sed -i "s/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/" MDANSE/__pkginfo__.py
# Get revision number from GIT # Get revision number from GIT
......
...@@ -12,7 +12,7 @@ else ...@@ -12,7 +12,7 @@ else
BUILD_TARGET=$1 BUILD_TARGET=$1
fi fi
COMMIT_ID=$(git rev-parse --long HEAD) COMMIT_ID=$(git rev-parse HEAD)
VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py` VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
if [[ ${CI_BUILD_REF_NAME} =~ develop ]] if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
......
version 1.0.8
-------------
* bug fix when getting git commit id in long format
version 1.0.7 version 1.0.7
------------- -------------
* = 1.0.6.a * = 1.0.6.a
......
__version__ = "1.0.7" __version__ = "1.0.8"
__date__ = "09-03-2017" __date__ = "09-03-2017"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment