diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20ce2c0cf99b20ac003d4eda2ce004b12eb9756a..f8976788c85a98e7704bd58bd12abc56e32d327a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,52 +90,52 @@ ubuntu_boost_system: # Latest Ubuntu with Boost, Exprtk and Turtle # compiled locally as submodules and # linked statically -ubuntu_boost_local_static_deps: - tags: - - centos7 - - image: martinbeseda/ubuntu-ci:latest - - before_script: - - export TERM=xterm - - cd build_scripts/linux - - ./download_dependencies.sh - - cd ../.. - - cd build_scripts/linux - - export DEPENDENCIES_LINK_TYPE=static - - export CLEAN_AFTER=yes - - ./linux_gcc_build_x64_debug_local.sh || exit 1 - - script: - - cd ../.. - - cd build_scripts/linux -# - './linux_run_tests.sh' - - cd ../.. +#ubuntu_boost_local_static_deps: +# tags: +# - centos7 +# +# image: martinbeseda/ubuntu-ci:latest +# +# before_script: +# - export TERM=xterm +# - cd build_scripts/linux +# - ./download_dependencies.sh +# - cd ../.. +# - cd build_scripts/linux +# - export DEPENDENCIES_LINK_TYPE=static +# - export CLEAN_AFTER=yes +# - ./linux_gcc_build_x64_debug_local.sh || exit 1 +# +# script: +# - cd ../.. +# - cd build_scripts/linux +## - './linux_run_tests.sh' +# - cd ../.. # Latest Ubuntu with Boost, Exprtk and Turtle # compiled locally as submodules and # linked dynamically -ubuntu_boost_local_dynamic_deps: - tags: - - centos7 - - image: martinbeseda/ubuntu-ci:latest - - before_script: - - export TERM=xterm - - cd build_scripts/linux - - ./download_dependencies.sh - - cd ../.. - - cd build_scripts/linux - - export DEPENDENCIES_LINK_TYPE=shared - - export CLEAN_AFTER=yes - - ./linux_gcc_build_x64_debug_local.sh || exit 1 - - script: - - cd ../.. - - cd build_scripts/linux -# - './linux_run_tests.sh' - - cd ../.. +#ubuntu_boost_local_dynamic_deps: +# tags: +# - centos7 +# +# image: martinbeseda/ubuntu-ci:latest +# +# before_script: +# - export TERM=xterm +# - cd build_scripts/linux +# - ./download_dependencies.sh +# - cd ../.. +# - cd build_scripts/linux +# - export DEPENDENCIES_LINK_TYPE=shared +# - export CLEAN_AFTER=yes +# - ./linux_gcc_build_x64_debug_local.sh || exit 1 +# +# script: +# - cd ../.. +# - cd build_scripts/linux +## - './linux_run_tests.sh' +# - cd ../.. #code_quality: diff --git a/build_scripts/linux/linux_gcc_build_x64_debug_system.sh b/build_scripts/linux/linux_gcc_build_x64_debug_system.sh index b729c581ef6fece246992e55fb351810c011d9a6..7813b107a4aea94c096af067e001c7924c4a6107 100755 --- a/build_scripts/linux/linux_gcc_build_x64_debug_system.sh +++ b/build_scripts/linux/linux_gcc_build_x64_debug_system.sh @@ -24,13 +24,13 @@ if [ -z ${DEPENDENCIES_LINK_TYPE} ]; then DEPENDENCIES_LINK_TYPE=static; fi if [ -z ${CLEAN_AFTER} ]; then CLEAN_AFTER=yes; fi LINK_TYPE=static -if [ $DEPENDENCIES_LINK_TYPE = "shared" ] +if [ ${DEPENDENCIES_LINK_TYPE} = "shared" ] then LINK_TYPE=shared fi CLEAN_AF=yes -if [ $CLEAN_AFTER = "no" ] +if [ ${CLEAN_AFTER} = "no" ] then CLEAN_AF=no fi @@ -49,7 +49,7 @@ echo "Building the '${CYAN}lib4neuro${NC}' project for ${WHITE}Debug${NC}" BUILD_SOMETHING=no BUILD_SOMETHING_LIB=no -if [ $BUILD_LIB = "yes" ] +if [ ${BUILD_LIB} = "yes" ] then echo "${CYAN}lib4neuro${NC} build type: ${WHITE}Debug${NC}" echo "${CYAN}lib4neuro${NC} build architecture: ${WHITE}x64${NC}" @@ -58,14 +58,14 @@ then BUILD_SOMETHING_LIB=yes fi -if [ $BUILD_TESTS = "yes" ] +if [ ${BUILD_TESTS} = "yes" ] then echo "${CYAN}lib4neuro${NC} unit tests will be built in '${YELLOW}build/unit-tests${NC}'" BUILD_SOMETHING=yes BUILD_SOMETHING_LIB=yes fi -if [ $BUILD_EXAMPLES = "yes" ] +if [ ${BUILD_EXAMPLES} = "yes" ] then echo "${CYAN}lib4neuro${NC} examples will be built in '${YELLOW}build/examples${NC}'" BUILD_SOMETHING=yes @@ -76,20 +76,20 @@ rm -rf ../../external_dependencies/boost/* rm -rf ../../external_dependencies/exprtk/* # Should we build the lib4neuro library? (yes) -if [ $BUILD_SOMETHING_LIB = "yes" -a $BUILD_ERROR_OCCURED = "0" ] +if [ ${BUILD_SOMETHING_LIB} = "yes" -a ${BUILD_ERROR_OCCURED} = "0" ] then - if [ $BUILD_LIB = "yes" ] + if [ ${BUILD_LIB} = "yes" ] then ./linux_clean_lib.sh fi - if [ $BUILD_EXAMPLES = "yes" ] + if [ ${BUILD_EXAMPLES} = "yes" ] then ./linux_clean_examples.sh fi - if [ $BUILD_TESTS = "yes" ] + if [ ${BUILD_TESTS} = "yes" ] then ./linux_clean_tests.sh fi @@ -101,7 +101,7 @@ then cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${C_COMPILER} -DBOOST_LIBRARYDIR=${BOOST_LIBRARYDIR} -DBOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -DBUILD_TESTS=${BUILD_TESTS} -DBUILD_EXAMPLES=${BUILD_EXAMPLES} -DBUILD_LIB=${BUILD_LIB} -DLIB4NEURO_DIR=${PWD}/build/lib -DDEPENDENCIES_LINK_TYPE=${LINK_TYPE} -DLIB4NEURO_INCLUDE_DIR=${LIB4NEURO_INCLUDE_DIR} . || ( echo "${RED}Makefile preparation finished with errors${NC}!"; BUILD_ERROR_OCCURED=1; ) - if [ $BUILD_ERROR_OCCURED = "0" ] + if [ ${BUILD_ERROR_OCCURED} = "0" ] then echo "Building the '${CYAN}lib4neuro${NC}' project for ${WHITE}Debug${NC} (building)" ( cmake --build . --config Debug -- -j${N_CORES} ) && ( echo "${GREEN}Build complete${NC}." ) || ( echo "${RED}Build finished with errors${NC}!"; BUILD_ERROR_OCCURED=1; ) @@ -113,29 +113,29 @@ fi if [ ${CLEAN_AF} = "yes" ] then -if [ $BUILD_LIB = "yes" ] +if [ ${BUILD_LIB} = "yes" ] then ./linux_clean_after_lib.sh fi -if [ $BUILD_EXAMPLES = "yes" ] +if [ ${BUILD_EXAMPLES} = "yes" ] then ./linux_clean_after_examples.sh fi -if [ $BUILD_TESTS = "yes" ] +if [ ${BUILD_TESTS} = "yes" ] then ./linux_clean_after_tests.sh fi -if [ $BUILD_SOMETHING_LIB = "yes" ] +if [ ${BUILD_SOMETHING_LIB} = "yes" ] then ./linux_clean_garbage.sh fi fi -if [ $BUILD_ERROR_OCCURED = "1" ] +if [ ${BUILD_ERROR_OCCURED} = "1" ] then echo "${RED}Build encountered some errors!${NC}" exit 1