Commit cf08c5d9 by Remi Perenon

Restoring cleaning stage

parent 49765107
......@@ -199,7 +199,7 @@ deploy:windows:
- sci
- windows-10
clean_docker:
clean:docker:
stage: clean
when: always
script:
......@@ -209,3 +209,22 @@ clean_docker:
- sci
- ubuntu
clean:osx:
stage: clean
when: always
script:
- source ${CI_PROJECT_DIR}/BuildServer/Unix/definitions_macos.sh
- ${CI_PROJECT_DIR}/BuildServer/Unix/clean.sh
tags:
- sci
- osx-10.13
clean:windows:
stage: clean
when: always
script:
- call "%CI_PROJECT_DIR%\\BuildServer\\Windows\\definitions.bat"
- call "%CI_PROJECT_DIR%\\BuildServer\\Windows\\clean.bat"
tags:
- sci
- windows-10
\ No newline at end of file
......@@ -23,14 +23,12 @@ ${PYTHONEXE} setup.py build
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "Failed to build Scientific""${NORMAL}"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
${PYTHONEXE} setup.py install --prefix=${MDANSE_TEMPORARY_INSTALLATION_DIR}
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "Failed to install Scientific""${NORMAL}"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
export NETCDF_HEADER_FILE_PATH=${MDANSE_TEMPORARY_INSTALLATION_DIR}/include/python2.7/
......@@ -47,14 +45,12 @@ ${PYTHONEXE} setup.py build
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "Failed to build MMTK""${NORMAL}"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
${PYTHONEXE} setup.py install --prefix=${MDANSE_TEMPORARY_INSTALLATION_DIR}
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "Failed to install MMTK""${NORMAL}"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
......@@ -69,14 +65,12 @@ ${PYTHONEXE} setup.py build
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "Failed to build MDANSE""${NORMAL}"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
${PYTHONEXE} setup.py install --prefix=${MDANSE_TEMPORARY_INSTALLATION_DIR}
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "Failed to install MDANSE""${NORMAL}"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
......
......@@ -9,6 +9,8 @@ cd ${MDANSE_SOURCE_DIR}
# UNITARY TESTS
#############################
echo -e "${BLUE}""Cleaning repository""${NORMAL}"
rm -rf /tmp/mmtk
rm -rf /tmp/scientific-python
rm -rf MDANSE_TEMPORARY_INSTALLATION_DIR
rm -rf build
rm -rf BuildServer/Build_Debian
......
......@@ -60,7 +60,6 @@ fakeroot dpkg-deb -b ${DEBIAN_ROOT_DIR} ${MDANSE_SOURCE_DIR}/BuildServer/MDANSE-
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "Cannot build app.""${NORMAL}"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
......
......@@ -26,7 +26,6 @@ ${PYTHONEXE} MacOS_resources/build.py py2app
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "Cannot build app.""${NORMAL}"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
......
......@@ -14,7 +14,6 @@ ${PYTHONEXE} AllTests.py
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "One or several unit tests failed"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
cd ${MDANSE_SOURCE_DIR}
......@@ -28,7 +27,6 @@ ${PYTHONEXE} AllTests.py
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "One or several dependencies tests failed"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
cd ${MDANSE_SOURCE_DIR}
......@@ -44,7 +42,6 @@ ${PYTHONEXE} AllTests.py
status=$?
if [ $status -ne 0 ]; then
echo -e "${RED}" "One or several functional tests failed"
${MDANSE_SOURCE_DIR}/BuildServer/Unix/clean.sh
exit $status
fi
cd ${MDANSE_SOURCE_DIR}
\ No newline at end of file
......@@ -37,14 +37,12 @@ set STATUS=%ERRORLEVEL%
rem Exit now if unable to build
if %STATUS% neq 0 (
echo "Failed to build Scientific"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
%PYTHON_EXE% setup.py install
rem Exit now if unable to install
if %STATUS% neq 0 (
echo "Failed to install Scientific"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
rem Copy netcdf dependencies
......@@ -64,14 +62,12 @@ set STATUS=%ERRORLEVEL%
rem Exit now if unable to build
if %STATUS% neq 0 (
echo "Failed to build MMTK"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
%PYTHON_EXE% setup.py install
rem Exit now if unable to install
if %STATUS% neq 0 (
echo "Failed to install MMTK"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
cd ..
......@@ -84,14 +80,12 @@ set STATUS=%ERRORLEVEL%
rem Exit now if unable to build
if %STATUS% neq 0 (
echo "Failed to build MDANSE"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
%PYTHON_EXE% setup.py install
rem Exit now if unable to install
if %STATUS% neq 0 (
echo "Failed to install MDANSE"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
rmdir /S /Q build
......
......@@ -5,6 +5,7 @@ rem BUILD_TARGET
rem MDANSE_DEPENDENCIES_DIR
rem MDANSE_TEMPORARY_INSTALLATION_DIR
cd %MDANSE_SOURCE_DIR%
rmdir /S /Q build
rmdir /S /Q BuildServer\\Windows\\Build
......
......@@ -21,7 +21,6 @@ set STATUS=%ERRORLEVEL%
rem Exit now if something goes wrong
if %STATUS% neq 0 (
echo "Failed when packaging MDANSE"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
......
......@@ -31,7 +31,6 @@ rem Exit now if something goes wrong
set STATUS=%ERRORLEVEL%
if %STATUS% neq 0 (
echo "Failed when running unitary tests"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
......@@ -43,7 +42,6 @@ rem Exit now if something goes wrong
set STATUS=%ERRORLEVEL%
if %STATUS% neq 0 (
echo "Failed when running dependencies tests"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
......@@ -60,7 +58,6 @@ rem Exit now if something goes wrong
set STATUS=%ERRORLEVEL%
if %STATUS% neq 0 (
echo "Failed when running functional tests"
call ${MDANSE_SOURCE_DIR}\\BuildServer\\Windows\\clean.bat
exit %STATUS%
)
......
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