From 61682a076c2eafdac02b51bd79b2dd18da0e9786 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Thu, 29 Aug 2019 21:54:57 +0200 Subject: [PATCH] update build command with // build --- .gitlab-ci.yml | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ded36be91..fce194ccf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -299,6 +299,10 @@ Linux client_static debian_amd64_strech build: - Docker image: amd64/debian:9 script: + # Calcul le nombre de cpu désactivé (on ne laisse que 4 au maximum) + - disableproc=$(( $(nproc) - 4 )) + - if [[ $disableproc -le 0 ]] ; then disableproc=0; fi + - optionproc="-j$(nproc --ignore=$disableproc)" # Prepare environment - DEBIAN_FRONTEND=noninteractive apt-get update - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y @@ -386,13 +390,13 @@ Linux client_static debian_amd64_strech build: - cd libvorbis - for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file; done - ./configure --enable-static --with-pic - - make + - make -j - make install - cd .. # Action - mkdir -p code/build - (cd code/build ; cmake -DWITH_NEL=ON -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_CUSTOM_PATCH_SERVER=ON -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_NEL_SAMPLES=ON -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON ..) - - (cd code/build; make khanat_client) + - (cd code/build; make $optionproc khanat_client) - (cd code/build/bin; ls -lh) artifacts: name: "khanat-client_static-debian_amd64_strech-$CI_COMMIT_REF_NAME" @@ -409,6 +413,10 @@ Linux client_static_debug debian_amd64_strech build: - Docker image: amd64/debian:9 script: + # Calcul le nombre de cpu désactivé (on ne laisse que 4 au maximum) + - disableproc=$(( $(nproc) - 4 )) + - if [[ $disableproc -le 0 ]] ; then disableproc=0; fi + - optionproc="-j$(nproc --ignore=$disableproc)" # Prepare environment - DEBIAN_FRONTEND=noninteractive apt-get update - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y @@ -501,7 +509,7 @@ Linux client_static_debug debian_amd64_strech build: # Action - mkdir -p code/build - (cd code/build ; cmake -DWITH_NEL=ON -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_CUSTOM_PATCH_SERVER=ON -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_NEL_SAMPLES=ON -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON -DWITH_SYMBOLS=ON ..) - - (cd code/build; make khanat_client) + - (cd code/build; make $optionproc khanat_client) - (cd code/build/bin; ls -lh) artifacts: name: "khanat-client_static_debug-debian_amd64_strech-$CI_COMMIT_REF_NAME" @@ -518,6 +526,10 @@ Linux server_static debian_amd64_strech build: - Docker image: amd64/debian:9 script: + # Calcul le nombre de cpu désactivé (on ne laisse que 4 au maximum) + - disableproc=$(( $(nproc) - 4 )) + - if [[ $disableproc -le 0 ]] ; then disableproc=0; fi + - optionproc="-j$(nproc --ignore=$disableproc)" # Prepare environment - DEBIAN_FRONTEND=noninteractive apt-get update - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y @@ -579,7 +591,7 @@ Linux server_static debian_amd64_strech build: - (cd code/build ; cmake -DWITH_NEL=ON -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_CUSTOM_PATCH_SERVER=ON -DWITH_NEL_TESTS=OFF ..) - ls -l code - ls -l code/build - - (cd code/build; make -j ryzom_admin_service ryzom_ai_service ryzom_backup_service ryzom_dynamic_scenario_service ryzom_entities_game_service ryzom_frontend_service ryzom_general_utilities_service ryzom_gpm_service ryzom_ios_service ryzom_log_analyser_service ryzom_logger_service ryzom_mail_forum_service ryzom_mirror_service ryzom_mission_compiler ryzom_monitor_service ryzom_naming_service ryzom_patchman_service ryzom_pd_support_service ryzom_persistant_data_service ryzom_reference_builder_service ryzom_session_browser_service ryzom_shard_unifier_service ryzom_tick_service ryzom_welcome_service sheets_packer bnp_make make_sheet_id patch_gen) + - (cd code/build; make $optionproc ryzom_admin_service ryzom_ai_service ryzom_backup_service ryzom_dynamic_scenario_service ryzom_entities_game_service ryzom_frontend_service ryzom_general_utilities_service ryzom_gpm_service ryzom_ios_service ryzom_log_analyser_service ryzom_logger_service ryzom_mail_forum_service ryzom_mirror_service ryzom_mission_compiler ryzom_monitor_service ryzom_naming_service ryzom_patchman_service ryzom_pd_support_service ryzom_persistant_data_service ryzom_reference_builder_service ryzom_session_browser_service ryzom_shard_unifier_service ryzom_tick_service ryzom_welcome_service sheets_packer bnp_make make_sheet_id patch_gen) - (cd code/build/bin; ls -lh) artifacts: name: "khanat-server_static-debian_amd64_strech-$CI_COMMIT_REF_NAME" @@ -609,6 +621,10 @@ Linux server_static_debug debian_amd64_strech build: - Docker image: amd64/debian:9 script: + # Calcul le nombre de cpu désactivé (on ne laisse que 4 au maximum) + - disableproc=$(( $(nproc) - 4 )) + - if [[ $disableproc -le 0 ]] ; then disableproc=0; fi + - optionproc="-j$(nproc --ignore=$disableproc)" # Prepare environment - DEBIAN_FRONTEND=noninteractive apt-get update - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y @@ -670,7 +686,7 @@ Linux server_static_debug debian_amd64_strech build: - (cd code/build ; cmake -DWITH_NEL=ON -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_CUSTOM_PATCH_SERVER=ON -DWITH_NEL_TESTS=OFF -DWITH_SYMBOLS=ON ..) - ls -l code - ls -l code/build - - (cd code/build; make -j ryzom_admin_service ryzom_ai_service ryzom_backup_service ryzom_dynamic_scenario_service ryzom_entities_game_service ryzom_frontend_service ryzom_general_utilities_service ryzom_gpm_service ryzom_ios_service ryzom_log_analyser_service ryzom_logger_service ryzom_mail_forum_service ryzom_mirror_service ryzom_mission_compiler ryzom_monitor_service ryzom_naming_service ryzom_patchman_service ryzom_pd_support_service ryzom_persistant_data_service ryzom_reference_builder_service ryzom_session_browser_service ryzom_shard_unifier_service ryzom_tick_service ryzom_welcome_service sheets_packer bnp_make make_sheet_id patch_gen) + - (cd code/build; make $optionproc ryzom_admin_service ryzom_ai_service ryzom_backup_service ryzom_dynamic_scenario_service ryzom_entities_game_service ryzom_frontend_service ryzom_general_utilities_service ryzom_gpm_service ryzom_ios_service ryzom_log_analyser_service ryzom_logger_service ryzom_mail_forum_service ryzom_mirror_service ryzom_mission_compiler ryzom_monitor_service ryzom_naming_service ryzom_patchman_service ryzom_pd_support_service ryzom_persistant_data_service ryzom_reference_builder_service ryzom_session_browser_service ryzom_shard_unifier_service ryzom_tick_service ryzom_welcome_service sheets_packer bnp_make make_sheet_id patch_gen) - (cd code/build/bin; ls -lh) artifacts: name: "khanat-server_static_debug-debian_amd64_strech-$CI_COMMIT_REF_NAME" @@ -700,6 +716,10 @@ Linux client_static debian_i386_strech build: - Docker image: i386/debian:9 script: + # Calcul le nombre de cpu désactivé (on ne laisse que 4 au maximum) + - disableproc=$(( $(nproc) - 4 )) + - if [[ $disableproc -le 0 ]] ; then disableproc=0; fi + - optionproc="-j$(nproc --ignore=$disableproc)" # Prepare environment - DEBIAN_FRONTEND=noninteractive apt-get update - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y @@ -760,7 +780,7 @@ Linux client_static debian_i386_strech build: # Action - mkdir -p code/build - (cd code/build ; cmake -DWITH_NEL=ON -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_CUSTOM_PATCH_SERVER=ON -DWITH_NEL_TESTS=OFF ..) - - (cd code/build; make khanat_client) + - (cd code/build; make $optionproc khanat_client) - (cd code/build/bin; ls -lh) artifacts: name: "khanat-client_static-debian_i386_strech-$CI_COMMIT_REF_NAME" @@ -778,6 +798,10 @@ Linux client_static_debug debian_i386_strech build: - Docker image: i386/debian:9 script: + # Calcul le nombre de cpu désactivé (on ne laisse que 4 au maximum) + - disableproc=$(( $(nproc) - 4 )) + - if [[ $disableproc -le 0 ]] ; then disableproc=0; fi + - optionproc="-j$(nproc --ignore=$disableproc)" # Prepare environment - DEBIAN_FRONTEND=noninteractive apt-get update - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y @@ -838,7 +862,7 @@ Linux client_static_debug debian_i386_strech build: # Action - mkdir -p code/build - (cd code/build ; cmake -DWITH_NEL=ON -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_SYMBOLS=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_CUSTOM_PATCH_SERVER=ON -DWITH_NEL_TESTS=OFF ..) - - (cd code/build; make khanat_client) + - (cd code/build; make $optionproc khanat_client) - (cd code/build/bin; ls -lh) artifacts: name: "khanat-client_static_debug-debian_i386_strech-$CI_COMMIT_REF_NAME"