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
49635868
Commit
49635868
authored
Jul 05, 2018
by
eric pellegrini
Browse files
Fixing the MacOS failing ci
parent
e0ef93d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
BuildServer/Unix/MacOS/definitions.sh
View file @
49635868
...
...
@@ -7,5 +7,3 @@ export PYTHONEXE=/usr/bin/python
# The sed -i"" is compulsory other crashes on macos
export
SED_I_COMMAND
=
'sed -i ""'
export
MDANSE_DEPENDENCIES_DIR
=
/Users/ci/Projects/mdanse/dependencies
BuildServer/Unix/version.sh
View file @
49635868
#!/bin/bash
cd
$
MDANSE_SOURCE
_DIR
cd
$
{
CI_PROJECT
_DIR
}
# Update the __pkginfo__ file with the current commit
echo
-e
"
${
BLUE
}
""Commit id =
${
MDANSE_GIT_CURRENT_COMMIT
}
<--""
${
NORMAL
}
"
echo
-e
"
${
BLUE
}
""Branch name =
${
MDANSE_GIT_BRANCH_NAME
}
<--""
${
NORMAL
}
"
$SED_I_COMMAND
"s/.*__commit__.*/__commit__ =
\"
${
MDANSE_GIT_CURRENT_COMMIT
}
\"
/"
MDANSE/__pkginfo__.py
$SED_I_COMMAND
"s/.*__commit__.*/__commit__ =
\"
${
MDANSE_GIT_CURRENT_COMMIT
}
\"
/"
${
CI_PROJECT_DIR
}
/
MDANSE/__pkginfo__.py
# Get MDANSE version
MDANSE_VERSION
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
MDANSE/__pkginfo__.py
`
MDANSE_VERSION
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
${
CI_PROJECT_DIR
}
/
MDANSE/__pkginfo__.py
`
# Check if branch is master
if
[[
${
MDANSE_GIT_BRANCH_NAME
}
==
"master"
]]
then
VERSION_NAME
=
${
MDANSE_VERSION
}
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ = None/"
MDANSE/__pkginfo__.py
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ = None/"
${
CI_PROJECT_DIR
}
/
MDANSE/__pkginfo__.py
else
# Check if branch is release*
if
[[
${
MDANSE_GIT_BRANCH_NAME
::7
}
==
"release"
]]
then
VERSION_NAME
=
${
MDANSE_VERSION
}
-rc-
${
MDANSE_GIT_CURRENT_COMMIT
}
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ =
\"
rc
\"
/"
MDANSE/__pkginfo__.py
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ =
\"
rc
\"
/"
${
CI_PROJECT_DIR
}
/
MDANSE/__pkginfo__.py
else
VERSION_NAME
=
${
MDANSE_VERSION
}
-beta-
${
MDANSE_GIT_CURRENT_COMMIT
}
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ =
\"
beta
\"
/"
MDANSE/__pkginfo__.py
$SED_I_COMMAND
"s/.*__beta__.*/__beta__ =
\"
beta
\"
/"
${
CI_PROJECT_DIR
}
/
MDANSE/__pkginfo__.py
fi
fi
export
VERSION_NAME
\ No newline at end of file
export
VERSION_NAME
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