build on strech are activated manually, and reduce number core/cpu use for build on buster

This commit is contained in:
AleaJactaEst 2019-10-07 23:11:20 +02:00
parent b2d7c05e80
commit 50f3ae38e5

View file

@ -228,6 +228,7 @@ Linux server debian_amd64_strech build:
- code/ryzom/client/windows - code/ryzom/client/windows
- code/ryzom/tools/scripts/linux - code/ryzom/tools/scripts/linux
# expire_in: 2 week # expire_in: 2 week
when: manual
Linux client debian_amd64_strech build: Linux client debian_amd64_strech build:
@ -294,6 +295,7 @@ Linux client debian_amd64_strech build:
paths: paths:
- code/build/bin - code/build/bin
# expire_in: 2 week # expire_in: 2 week
when: manual
Linux client_static debian_amd64_strech build: Linux client_static debian_amd64_strech build:
@ -409,6 +411,7 @@ Linux client_static debian_amd64_strech build:
paths: paths:
- code/build/bin - code/build/bin
# expire_in: 2 week # expire_in: 2 week
when: manual
Linux client_static_debug debian_amd64_strech build: Linux client_static_debug debian_amd64_strech build:
@ -523,6 +526,7 @@ Linux client_static_debug debian_amd64_strech build:
paths: paths:
- code/build/bin - code/build/bin
# expire_in: 2 week # expire_in: 2 week
when: manual
Linux server_static debian_amd64_strech build: Linux server_static debian_amd64_strech build:
@ -618,6 +622,7 @@ Linux server_static debian_amd64_strech build:
- code/ryzom/client/windows - code/ryzom/client/windows
- code/ryzom/tools/scripts/linux - code/ryzom/tools/scripts/linux
# expire_in: 2 week # expire_in: 2 week
when: manual
Linux server_static_debug debian_amd64_strech build: Linux server_static_debug debian_amd64_strech build:
@ -713,6 +718,7 @@ Linux server_static_debug debian_amd64_strech build:
- code/ryzom/client/windows - code/ryzom/client/windows
- code/ryzom/tools/scripts/linux - code/ryzom/tools/scripts/linux
# expire_in: 2 week # expire_in: 2 week
when: manual
Linux server_static_debug debian_amd64_buster build: Linux server_static_debug debian_amd64_buster build:
@ -858,6 +864,7 @@ Linux client_static debian_i386_strech build:
paths: paths:
- code/build/bin - code/build/bin
# expire_in: 2 week # expire_in: 2 week
when: manual
Linux client_static_debug debian_i386_strech build: Linux client_static_debug debian_i386_strech build:
@ -939,6 +946,7 @@ Linux client_static_debug debian_i386_strech build:
paths: paths:
- code/build/bin - code/build/bin
# expire_in: 2 week # expire_in: 2 week
when: manual
# Fedora Client # Fedora Client
@ -1257,6 +1265,11 @@ Linux client debian_amd64_buster build:
- Docker - Docker
image: amd64/debian:10 image: amd64/debian:10
script: 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)"
- echo "disableproc:$disableproc, nb core compile:$(nproc --ignore=$disableproc) optionproc:$optionproc"
# Prepare environment # Prepare environment
- DEBIAN_FRONTEND=noninteractive apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
@ -1308,7 +1321,7 @@ Linux client debian_amd64_buster build:
# - (cd code/build ; cmake -DWITH_NEL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=OFF -DWITH_RYZOM_CUSTOM_PATCH_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_NEL_SAMPLES=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON ..) # - (cd code/build ; cmake -DWITH_NEL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=OFF -DWITH_RYZOM_CUSTOM_PATCH_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_NEL_SAMPLES=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON ..)
# - (cd code/build; make -j khanat_client) # - (cd code/build; make -j khanat_client)
- (cd code/build ; cmake -DWITH_INSTALL_LIBRARIES=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_STUDIO=OFF -DWITH_STATIC=ON -DWITH_RYZOM_TOOLS=OFF -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=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON ..) - (cd code/build ; cmake -DWITH_INSTALL_LIBRARIES=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_STUDIO=OFF -DWITH_STATIC=ON -DWITH_RYZOM_TOOLS=OFF -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=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON ..)
- (cd code/build; make -j ) - (cd code/build; make $optionproc )
- (cd code/build/bin; ls -lh) - (cd code/build/bin; ls -lh)
artifacts: artifacts:
name: "khanat-client-debian_buster-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID" name: "khanat-client-debian_buster-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID"
@ -1326,6 +1339,11 @@ Linux client_appimage debian_amd64_buster build:
- Docker - Docker
image: amd64/debian:10 image: amd64/debian:10
script: 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)"
- echo "disableproc:$disableproc, nb core compile:$(nproc --ignore=$disableproc) optionproc:$optionproc"
# Prepare environment # Prepare environment
- DEBIAN_FRONTEND=noninteractive apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
@ -1393,8 +1411,8 @@ Linux client_appimage debian_amd64_buster build:
- mkdir -p code/build - mkdir -p code/build
#- (cd code/build ; cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_INSTALL_LIBRARIES=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_STUDIO=OFF -DWITH_STATIC=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=OFF -DWITH_RYZOM_CUSTOM_PATCH_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_NEL_SAMPLES=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON ..) #- (cd code/build ; cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_INSTALL_LIBRARIES=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_STUDIO=OFF -DWITH_STATIC=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=OFF -DWITH_RYZOM_CUSTOM_PATCH_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_NEL_SAMPLES=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON ..)
- (cd code/build ; cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_INSTALL_LIBRARIES=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_STUDIO=OFF -DWITH_STATIC=ON -DWITH_RYZOM_TOOLS=OFF -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=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON ..) - (cd code/build ; cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_INSTALL_LIBRARIES=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_STUDIO=OFF -DWITH_STATIC=ON -DWITH_RYZOM_TOOLS=OFF -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=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON ..)
- (cd code/build; make -j ) - (cd code/build; make $optionproc )
- (cd code/build; make -j install DESTDIR=AppDir) - (cd code/build; make $optionproc install DESTDIR=AppDir)
# Generate AppImage # Generate AppImage
- (cd code/build; rm -rf AppDir/usr/bin) - (cd code/build; rm -rf AppDir/usr/bin)
- (cd code/build; mv AppDir/usr/games AppDir/usr/bin) - (cd code/build; mv AppDir/usr/games AppDir/usr/bin)