From 974ee5508af30ad935fdedcdad1ca2a7239897e5 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Wed, 28 Aug 2019 21:01:33 +0200 Subject: [PATCH] update build option to parallelize build --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c424b04fe..ded36be91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -620,7 +620,7 @@ Linux server_static_debug debian_amd64_strech build: - mkdir -p curl/build - tar xvf curl.tar.gz -C curl --strip 1 - (cd curl/build; cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_CURL_TESTS=OFF -DCURL_ZLIB=ON -DBUILD_CURL_EXE=OFF -DCURL_STATICLIB=ON -DHTTP_ONLY=ON -DENABLE_IPV6=ON -DCMAKE_USE_OPENSSL=ON -DOPENSSL_SSL_LIBRARIES=/usr/lib/x86_64-linux-gnu/libssl.a -DOPENSSL_CRYPTO_LIBRARIES=/usr/lib/x86_64-linux-gnu/libcrypto.a -DCMAKE_USE_LIBSSH2=OFF -DZLIB_LIBRARY=/usr/lib/x86_64-linux-gnu/libz.a -DCMAKE_C_FLAGS='-fPIC' ..) - - (cd curl/build; make) + - (cd curl/build; make -j) - (cd curl/build; make install) # Build luabind - mkdir -p luabind @@ -643,7 +643,7 @@ Linux server_static_debug debian_amd64_strech build: - patch -p1 < ../libogg.diff - cd build - ../configure --disable-maintainer-mode --host=$(dpkg-architecture -qDEB_HOST_GNU_TYPE) --build=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) --libdir=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) --enable-static --prefix=/usr CPPFLAGS="-D_FORTIFY_SOURCE=2" CFLAGS="-Wformat=2 -g -fPIC" CXXFLAGS="-Wformat=2 -g -fPIC" LDFLAGS="-Wl,-z,now" - - make + - make -j - make install - cd ../.. # Build libvorbis @@ -662,7 +662,7 @@ Linux server_static_debug 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 @@ -670,7 +670,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 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 -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/bin; ls -lh) artifacts: name: "khanat-server_static_debug-debian_amd64_strech-$CI_COMMIT_REF_NAME" @@ -1305,6 +1305,7 @@ Linux client_appimage debian_amd64_buster build: - (cd code/build; sed -i 's/Exec=games\//Exec=/g' AppDir/usr/share/applications/khanat_client.desktop) - (cd code/build; sed -i 's/Version=0.1/Version=1.0/g' AppDir/usr/share/applications/khanat_client.desktop) - (cd code/build; ../../appimage/squashfs-root/AppRun --appdir AppDir --output appimage) + - (ls -lh code/build/Khanat-x86_64.AppImage) artifacts: name: "khanat-client_appimage-debian_buster-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID" paths: