Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
MDANSE
Commits
187309ba
Commit
187309ba
authored
Jun 01, 2018
by
Remi Perenon
Browse files
Automatic version generation between Nothing (release), rc and beta
parent
63e446df
Pipeline
#3815
passed with stages
in 13 minutes and 11 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
BuildServer/Unix/version.sh
View file @
187309ba
...
...
@@ -10,14 +10,20 @@ $SED_I_COMMAND "s/.*__commit__.*/__commit__ = \"${MDANSE_GIT_CURRENT_COMMIT}\"/"
# Get MDANSE version
MDANSE_VERSION
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
MDANSE/__pkginfo__.py
`
# Check if branch is master
, tag as draft otherwise
# Check if branch is master
if
[[
${
CI_COMMIT_REF_NAME
}
==
"master"
]]
then
VERSION_NAME
=
${
MDANSE_VERSION
}
$SED_I_COMMAND
"s/.*__commit__.*/__commit__ =
\"
${
MDANSE_GIT_CURRENT_COMMIT
}
\"
/"
MDANSE/__pkginfo__.py
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ = False/"
MDANSE/__pkginfo__.py
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ = None/"
MDANSE/__pkginfo__.py
else
VERSION_NAME
=
${
MDANSE_VERSION
}
-
"beta"
-
${
MDANSE_GIT_CURRENT_COMMIT
}
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ = True/"
MDANSE/__pkginfo__.py
# Check if branch is release*
if
[[
${
CI_COMMIT_REF_NAME
::7
}
==
"release"
]]
then
VERSION_NAME
=
${
MDANSE_VERSION
}
-rc-
${
MDANSE_GIT_CURRENT_COMMIT
}
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ =
\"
rc
\"
/"
MDANSE/__pkginfo__.py
else
VERSION_NAME
=
${
MDANSE_VERSION
}
-beta-
${
MDANSE_GIT_CURRENT_COMMIT
}
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ =
\"
beta
\"
/"
MDANSE/__pkginfo__.py
fi
fi
export
VERSION_NAME
\ No newline at end of file
BuildServer/Windows/version.bat
View file @
187309ba
...
...
@@ -17,8 +17,14 @@ for /F %%i in (' %cmd% ') do set MDANSE_VERSION=%%i
rem Check if branch is master, tag as draft otherwise
if
"
%CI_COMMIT_REF_NAME%
"
==
"master"
(
set
VERSION_NAME
=
%MDANSE_VERSION%
sed
-i
"s/.*__beta__.*/__beta__ =
Fals
e/"
MDANSE
/__pkginfo__.py
sed
-i
"s/.*__beta__.*/__beta__ =
Non
e/"
MDANSE
/__pkginfo__.py
)
else
(
set
VERSION_NAME
=
%MDANSE_VERSION%
-
"beta"
-
%MDANSE_GIT_CURRENT_COMMIT%
sed
-i
"s/.*__beta__.*/__beta__ = True/"
MDANSE
/__pkginfo__.py
rem Check if branch is release*
if
"
%CI
_COMMIT_REF_NAME:~0,7
%
"
==
"release"
(
set
VERSION_NAME
=
%MDANSE_VERSION%
-rc
-
%MDANSE_GIT_CURRENT_COMMIT%
sed
-i
"s/.*__beta__.*/__beta__ = \"
rc
\
"/"
MDANSE
/__pkginfo__.py
)
else
(
set
VERSION_NAME
=
%MDANSE_VERSION%
-beta
-
%MDANSE_GIT_CURRENT_COMMIT%
sed
-i
"s/.*__beta__.*/__beta__ = \"
beta
\
"/"
MDANSE
/__pkginfo__.py
)
)
\ No newline at end of file
MDANSE/GUI/MainFrame.py
View file @
187309ba
...
...
@@ -232,9 +232,9 @@ class MainFrame(wx.Frame):
def
on_about
(
self
,
event
=
None
):
if
__beta__
:
beta_string
=
" (
beta)"
beta_string
=
" (
"
+
str
(
__beta__
)
+
")"
else
:
beta_string
=
""
beta_string
=
""
about_str
=
\
"""MDANSE version %s (commit %s).
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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