Commit 5dd91b6a authored by Remi Perenon's avatar Remi Perenon

Cleaning scripts

parent b682942d
Pipeline #4338 passed with stages
in 16 minutes and 24 seconds
...@@ -6,3 +6,7 @@ export PYTHONEXE=/usr/bin/python ...@@ -6,3 +6,7 @@ export PYTHONEXE=/usr/bin/python
export SED_I_COMMAND=(sed -i) export SED_I_COMMAND=(sed -i)
# Define colors
export RED="\\033[1;31m"
export BLUE="\\033[1;34m"
export NORMAL="\\033[0m"
...@@ -9,7 +9,6 @@ export DISTUTILS_DEBUG=0 ...@@ -9,7 +9,6 @@ export DISTUTILS_DEBUG=0
############################# #############################
# PREPARATION # PREPARATION
############################# #############################
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DEBIAN_ROOT_DIR=${CI_TEMP_DIR}/dist DEBIAN_ROOT_DIR=${CI_TEMP_DIR}/dist
...@@ -75,4 +74,3 @@ if [ $status -ne 0 ]; then ...@@ -75,4 +74,3 @@ if [ $status -ne 0 ]; then
echo -e "${RED}" "Cannot build app.""${NORMAL}" echo -e "${RED}" "Cannot build app.""${NORMAL}"
exit $status exit $status
fi fi
...@@ -12,4 +12,3 @@ do ...@@ -12,4 +12,3 @@ do
install_name_tool -change /usr/local/lib/libwx_$l-3.0.dylib @executable_path/../Frameworks/libwx_$l-3.0.dylib $f install_name_tool -change /usr/local/lib/libwx_$l-3.0.dylib @executable_path/../Frameworks/libwx_$l-3.0.dylib $f
done done
done done
...@@ -7,3 +7,7 @@ export PYTHONEXE=/usr/bin/python ...@@ -7,3 +7,7 @@ export PYTHONEXE=/usr/bin/python
# The sed -i"" is compulsory other crashes on macos # The sed -i"" is compulsory other crashes on macos
export SED_I_COMMAND=(sed -i "") export SED_I_COMMAND=(sed -i "")
# Define colors
export RED="\\033[1;31m"
export BLUE="\\033[1;34m"
export NORMAL="\\033[0m"
...@@ -52,7 +52,6 @@ ${PYTHONEXE} setup.py install --prefix=${CI_TEMP_INSTALL_DIR} ...@@ -52,7 +52,6 @@ ${PYTHONEXE} setup.py install --prefix=${CI_TEMP_INSTALL_DIR}
status=$? status=$?
if [ $status -ne 0 ]; then if [ $status -ne 0 ]; then
echo -e "${RED}" "Failed to build MDANSE""${NORMAL}" echo -e "${RED}" "Failed to build/install MDANSE""${NORMAL}"
exit $status exit $status
fi fi
...@@ -32,10 +32,6 @@ if [ -z ${CI_COMMIT_REF_NAME} ]; then ...@@ -32,10 +32,6 @@ if [ -z ${CI_COMMIT_REF_NAME} ]; then
export CI_COMMIT_REF_NAME export CI_COMMIT_REF_NAME
fi fi
export RED="\\033[1;31m"
export BLUE="\\033[1;34m"
export NORMAL="\\033[0m"
echo -e "${BLUE}""Commit id = ${CI_COMMIT_ID}""${NORMAL}" echo -e "${BLUE}""Commit id = ${CI_COMMIT_ID}""${NORMAL}"
echo -e "${BLUE}""Branch name = ${CI_COMMIT_REF_NAME}""${NORMAL}" echo -e "${BLUE}""Branch name = ${CI_COMMIT_REF_NAME}""${NORMAL}"
...@@ -64,5 +60,3 @@ else ...@@ -64,5 +60,3 @@ else
fi fi
fi fi
export VERSION_NAME export VERSION_NAME
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
############################# #############################
# PREPARATION # PREPARATION
############################# #############################
export PYTHONPATH=${CI_TEMP_INSTALL_DIR}/lib/python2.7/site-packages:${PYTHONPATH} export PYTHONPATH=${CI_TEMP_INSTALL_DIR}/lib/python2.7/site-packages:${PYTHONPATH}
############################# #############################
...@@ -43,4 +42,3 @@ if [ $status -ne 0 ]; then ...@@ -43,4 +42,3 @@ if [ $status -ne 0 ]; then
echo -e "${RED}" "One or several functional tests failed" echo -e "${RED}" "One or several functional tests failed"
exit $status exit $status
fi fi
@echo off @echo off
rem VERSION_NAME
rem MDANSE_SOURCE_DIR
rem BUILD_TARGET
rem MDANSE_DEPENDENCIES_DIR
rem MDANSE_TEMPORARY_INSTALLATION_DIR
rem Set the location of the MDANSE CI scripts rem Set the location of the MDANSE CI scripts
set BUILD_SCRIPT_DIR=%MDANSE_SOURCE_DIR%\\BuildServer\\Windows set BUILD_SCRIPT_DIR=%MDANSE_SOURCE_DIR%\\BuildServer\\Windows
......
...@@ -24,4 +24,4 @@ set cmd="git rev-parse --short HEAD" ...@@ -24,4 +24,4 @@ set cmd="git rev-parse --short HEAD"
for /F %%i in (' %cmd% ') do set MDANSE_GIT_CURRENT_COMMIT=%%i for /F %%i in (' %cmd% ') do set MDANSE_GIT_CURRENT_COMMIT=%%i
rem Get commit branch from Gitlab rem Get commit branch from Gitlab
set MDANSE_GIT_BRANCH_NAME=%CI_COMMIT_REF_NAME% set MDANSE_GIT_BRANCH_NAME=%CI_COMMIT_REF_NAME%
\ No newline at end of file
@echo off @echo off
rem VERSION_NAME
rem MDANSE_SOURCE_DIR
rem BUILD_TARGET
rem MDANSE_DEPENDENCIES_DIR
rem MDANSE_TEMPORARY_INSTALLATION_DIR
cd %MDANSE_SOURCE_DIR% cd %MDANSE_SOURCE_DIR%
......
...@@ -26,4 +26,4 @@ if "%MDANSE_GIT_BRANCH_NAME%" == "master" ( ...@@ -26,4 +26,4 @@ if "%MDANSE_GIT_BRANCH_NAME%" == "master" (
set VERSION_NAME=%MDANSE_VERSION%-beta-%MDANSE_GIT_CURRENT_COMMIT% set VERSION_NAME=%MDANSE_VERSION%-beta-%MDANSE_GIT_CURRENT_COMMIT%
sed -i "s/.*__beta__.*/__beta__ = \"beta\"/" MDANSE/__pkginfo__.py sed -i "s/.*__beta__.*/__beta__ = \"beta\"/" MDANSE/__pkginfo__.py
) )
) )
\ No newline at end of file
@echo off @echo off
rem VERSION_NAME
rem MDANSE_SOURCE_DIR
rem BUILD_TARGET
rem MDANSE_DEPENDENCIES_DIR
rem MDANSE_TEMPORARY_INSTALLATION_DIR
:: %1 --> the build target :: %1 --> the build target
......
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