diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7f6e5c51..ecc4f4a16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ # Configuration for Continous Integration # -# Copyright (C) 2017 AleaJactaEst +# Copyright (C) 2017 Khanat # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -150,6 +150,11 @@ Linux server debian_amd64_strech build: name: "khanat-server-debian_strech-$CI_COMMIT_REF_NAME" paths: - code/build/bin + - code/web + - code/ryzom/server/*.cfg + - code/ryzom/server/data_shard + - code/ryzom/common + - code/ryzom/client expire_in: 2 week @@ -541,15 +546,26 @@ Windows client build: libfreetype6:i386 bzip2 wget + dos2unix # Action - mkdir -p wincross - - builder/cross_win32.sh - - ls wincross - - ls wincross/win + - source builder/cross_win32.sh + - mkdir -p codebis + - cp -r code/* codebis/. + - find codebis -type f -name "*.h*" -exec unix2dos {} \; + - find codebis -type f -name "*.c*" -exec unix2dos {} \; + - find codebis -type f -name "*.txt" -exec unix2dos {} \; + - find codebis -type f -name "*.rc" -exec unix2dos {} \; + - mkdir -p build + - cd build + - wine cmake.exe -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_PATCH=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_LUA53=ON -DWITH_LUA51=OFF -DWITH_STLPORT=OFF -DWITH_DRIVER_DSOUND=ON -G "NMake Makefiles JOM" -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_DRIVER_OPENAL=OFF -DWITH_DRIVER_DSOUND=ON -DWITH_DRIVER_XAUDIO2=ON -DWITH_DRIVER_FMOD=ON -DWITH_DRIVER_DIRECT3D=ON ../codebis + - wine jom.exe + - ls -l wincross + - ls -l wincross/wine artifacts: name: "khanat-client-windows-$CI_COMMIT_REF_NAME" paths: - - wincross + - build/bin expire_in: 2 week # Job de compilation pour OSX