Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
MDANSE
Commits
89b3549e
Commit
89b3549e
authored
Mar 09, 2017
by
eric pellegrini
Browse files
Merge branch 'release-1.0.8'
parents
b184c285
3e031f44
Pipeline
#1518
passed with stages
in 19 minutes and 33 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
BuildServer/Darwin/Scripts/run_build.sh
View file @
89b3549e
...
...
@@ -17,7 +17,7 @@ BUILD_TARGET=darwin
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
COMMIT_ID
=
$(
git rev-parse
--long
HEAD
)
COMMIT_ID
=
$(
git rev-parse HEAD
)
sed
-i
""
"s/.*__commit__.*/__commit__ =
\"
${
COMMIT_ID
}
\"
/"
MDANSE/__pkginfo__.py
# Get revision number from git (without trailing newline)
...
...
BuildServer/Darwin/Scripts/run_deploy.sh
View file @
89b3549e
...
...
@@ -10,7 +10,7 @@
ROUGE
=
"
\\
033[1;31m"
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
`
if
[[
${
CI_BUILD_REF_NAME
}
=
~ develop
]]
...
...
BuildServer/Debian/run_build.sh
View file @
89b3549e
...
...
@@ -14,7 +14,7 @@ cd
cd
$CI_PROJECT_DIR
# 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
# Get revision number from git (without trailing newline)
...
...
BuildServer/Debian/run_deploy.sh
View file @
89b3549e
...
...
@@ -11,7 +11,7 @@ export DISTRO=$2
ROUGE
=
"
\\
033[1;31m"
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
`
if
[[
${
CI_BUILD_REF_NAME
}
=
~ develop
]]
...
...
BuildServer/Windows/run_build.sh
View file @
89b3549e
...
...
@@ -195,7 +195,7 @@ rm pythonlog.txt
cd
${
CI_PROJECT_DIR
}
# 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
# Get revision number from GIT
...
...
BuildServer/Windows/run_deploy.sh
View file @
89b3549e
...
...
@@ -12,7 +12,7 @@ else
BUILD_TARGET
=
$1
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
`
if
[[
${
CI_BUILD_REF_NAME
}
=
~ develop
]]
...
...
CHANGELOG
View file @
89b3549e
version 1.0.8
-------------
* bug fix when getting git commit id in long format
version 1.0.7
-------------
* = 1.0.6.a
...
...
MDANSE/__pkginfo__.py
View file @
89b3549e
__version__
=
"1.0.
7
"
__version__
=
"1.0.
8
"
__date__
=
"09-03-2017"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment