add package step and disable (temporary) auto build other package
This commit is contained in:
parent
9412aa2c2a
commit
f9f13dbb8f
1 changed files with 52 additions and 10 deletions
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
stages:
|
||||
- build
|
||||
- package
|
||||
- test
|
||||
#- staging
|
||||
#- production
|
||||
|
|
@ -48,6 +49,7 @@ Linux client build:
|
|||
- Docker
|
||||
image: debian:jessie
|
||||
script:
|
||||
- pwd
|
||||
# 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
|
||||
|
|
@ -131,6 +133,7 @@ Linux client build:
|
|||
- cp ./dist/khanat/autoextract_script.sh ./Linux/x86_64/
|
||||
- chmod +x ./Linux/x86_64/autoextract_script.sh
|
||||
- makeself --nox11 --target /tmp/khanat_installer ./Linux/x86_64/ khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run "Khanat installer" ./autoextract_script.sh
|
||||
- pwd
|
||||
artifacts:
|
||||
name: "khanat-$(echo $CI_BUILD_REF | head -c 7)-$CI_PIPELINE_ID-Linux-x86_64"
|
||||
paths:
|
||||
|
|
@ -402,7 +405,9 @@ Linux client_static debian_amd64_strech build:
|
|||
name: "khanat-client_static-debian_amd64_strech-$CI_COMMIT_REF_NAME"
|
||||
paths:
|
||||
- code/build/bin
|
||||
# expire_in: 2 week
|
||||
expire_in: 2 week
|
||||
when: manual
|
||||
|
||||
|
||||
|
||||
Linux client_static_debug debian_amd64_strech build:
|
||||
|
|
@ -516,6 +521,8 @@ Linux client_static_debug debian_amd64_strech build:
|
|||
paths:
|
||||
- code/build/bin
|
||||
# expire_in: 2 week
|
||||
when: manual
|
||||
|
||||
|
||||
|
||||
Linux server_static debian_amd64_strech build:
|
||||
|
|
@ -611,6 +618,8 @@ Linux server_static debian_amd64_strech build:
|
|||
- code/ryzom/client/windows
|
||||
- code/ryzom/tools/scripts/linux
|
||||
# expire_in: 2 week
|
||||
when: manual
|
||||
|
||||
|
||||
|
||||
Linux server_static_debug debian_amd64_strech build:
|
||||
|
|
@ -706,6 +715,8 @@ Linux server_static_debug debian_amd64_strech build:
|
|||
- code/ryzom/client/windows
|
||||
- code/ryzom/tools/scripts/linux
|
||||
# expire_in: 2 week
|
||||
when: manual
|
||||
|
||||
|
||||
|
||||
Linux client_static debian_i386_strech build:
|
||||
|
|
@ -787,6 +798,8 @@ Linux client_static debian_i386_strech build:
|
|||
paths:
|
||||
- code/build/bin
|
||||
# expire_in: 2 week
|
||||
when: manual
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -869,6 +882,8 @@ Linux client_static_debug debian_i386_strech build:
|
|||
paths:
|
||||
- code/build/bin
|
||||
# expire_in: 2 week
|
||||
when: manual
|
||||
|
||||
|
||||
|
||||
# Fedora Client
|
||||
|
|
@ -1177,6 +1192,8 @@ Linux server debian_amd64_buster build:
|
|||
- code/ryzom/client/windows
|
||||
- code/ryzom/tools/scripts/linux
|
||||
expire_in: 2 week
|
||||
when: manual
|
||||
|
||||
|
||||
|
||||
Linux client debian_amd64_buster build:
|
||||
|
|
@ -1216,7 +1233,6 @@ Linux client debian_amd64_buster build:
|
|||
libxrandr-dev
|
||||
libxrender-dev
|
||||
libxxf86vm-dev
|
||||
makeself
|
||||
mercurial
|
||||
rrdtool
|
||||
unzip
|
||||
|
|
@ -1238,12 +1254,6 @@ 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; make khanat_client)
|
||||
- (cd code/build/bin; ls -lh)
|
||||
- mkdir -p Linux/x86_64
|
||||
- cp code/build/bin/* Linux/x86_64
|
||||
# Packaging
|
||||
- cp ./dist/khanat/autoextract_script.sh ./Linux/x86_64/
|
||||
- chmod +x ./Linux/x86_64/autoextract_script.sh
|
||||
- makeself --nox11 --target /tmp/khanat_installer ./Linux/x86_64/ khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run "Khanat installer" ./autoextract_script.sh
|
||||
artifacts:
|
||||
name: "khanat-client-debian_buster-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID"
|
||||
paths:
|
||||
|
|
@ -1340,6 +1350,8 @@ Linux client_appimage debian_amd64_buster build:
|
|||
paths:
|
||||
- code/build/Khanat-x86_64.AppImage
|
||||
expire_in: 2 week
|
||||
when: manual
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1381,6 +1393,8 @@ Windows client build:
|
|||
paths:
|
||||
- build/bin
|
||||
# expire_in: 2 week
|
||||
when: manual
|
||||
|
||||
|
||||
|
||||
# Job de compilation pour OSX
|
||||
|
|
@ -1409,6 +1423,34 @@ OSX client build:
|
|||
when: manual
|
||||
|
||||
|
||||
## Package
|
||||
Linux client package:
|
||||
stage: package
|
||||
except:
|
||||
- ryzomcore
|
||||
- mac-ci-build
|
||||
tags:
|
||||
- Docker
|
||||
image: amd64/debian:10
|
||||
script:
|
||||
# Prepare environment
|
||||
- DEBIAN_FRONTEND=noninteractive apt-get update
|
||||
- DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
|
||||
- apt-get install -y makeself
|
||||
# Test de l'installation initiale
|
||||
- ls -l
|
||||
- mkdir -p Linux/x86_64
|
||||
- cp code/build/bin/* Linux/x86_64
|
||||
# Packaging
|
||||
- cp ./dist/khanat/autoextract_script.sh ./Linux/x86_64/
|
||||
- chmod +x ./Linux/x86_64/autoextract_script.sh
|
||||
- makeself --nox11 --target /tmp/khanat_installer ./Linux/x86_64/ khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run "Khanat installer" ./autoextract_script.sh
|
||||
- ls -l
|
||||
- ./khanat-client-debian_buster-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run
|
||||
dependencies:
|
||||
- Linux client debian_amd64_buster build
|
||||
|
||||
|
||||
## TESTS
|
||||
Linux client test:
|
||||
stage: test
|
||||
|
|
@ -1422,8 +1464,8 @@ Linux client test:
|
|||
# Test de l'installation initiale
|
||||
- ls -l
|
||||
- ./khanat-client-debian_buster-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run
|
||||
dependencies:
|
||||
- Linux client debian_amd64_buster build
|
||||
dependencies:
|
||||
- Linux client package
|
||||
|
||||
.OSX client test:
|
||||
stage: test
|
||||
|
|
|
|||
Loading…
Reference in a new issue