diff --git a/.gitlab-ci-files/job-linux-desktop-centos7.yml b/.gitlab-ci-files/job-linux-desktop-centos7.yml index 839a17b8c..f304901d7 100644 --- a/.gitlab-ci-files/job-linux-desktop-centos7.yml +++ b/.gitlab-ci-files/job-linux-desktop-centos7.yml @@ -40,7 +40,7 @@ job-centos7-ninja-gcc: CC: gcc CXX: g++ extends: .job-linux-desktop - + #job-centos7-ninja-clang: @@ -63,17 +63,19 @@ job-centos7-ninja-gcc: job-centos7-ninja-gcc-package: stage: package tags: [ "docker-test-centos7-liblinphone-nuc" ] - #image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 + #image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-qt-fuse-wget:5.12.5 - only: - variables: - - $NIGHTLY_MASTER - - $DEPLOY_LINUX + dependencies: [] +# only: +# variables: +# - $NIGHTLY_MASTER +# - $DEPLOY_LINUX variables: CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES CMAKE_GENERATOR: Ninja CC: gcc CXX: g++ + CI_DEBUG_TRACE: "true" extends: .job-linux-desktop artifacts: paths: @@ -95,7 +97,7 @@ job-centos7-ninja-gcc-deploy: - $DEPLOY_LINUX script: - scp build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$APPIMAGE_UPLOAD_DIRECTORY/ - + ################################################# # Debug ################################################# diff --git a/.gitlab-ci-files/job-linux-desktop.yml b/.gitlab-ci-files/job-linux-desktop.yml index 978b600e9..090d64b91 100644 --- a/.gitlab-ci-files/job-linux-desktop.yml +++ b/.gitlab-ci-files/job-linux-desktop.yml @@ -6,6 +6,9 @@ stage: build extends: .linux-prepare script: + - echo $CI_BUILDS_DIR + - echo $CI_BUILDS_DIR + - echo $CI_DEBUG_TRACE - cmake --version - export CC=$CC - export CXX=$CXX @@ -16,7 +19,7 @@ - echo $CMAKE_SANITIZER_OPTIONS # SDK Building - cd build - - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS + - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS - cmake --build . --target all $LBC_NODEBUG_OPTIONS artifacts: paths: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffa820b2e..cffdb206e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,11 +7,11 @@ variables: MAKEFILE_JOBS: 5 CCACHE_SIZE: 2G #this option is used to speedup submodule building times, when we don't need to trace debug (like SDK where it is already tested in its project) - LBC_NODEBUG_OPTIONS : --parallel $MAKEFILE_JOBS + LBC_NODEBUG_OPTIONS : --parallel $MAKEFILE_JOBS DEFAULT_LINUX_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS DEFAULT_MACOS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS DEFAULT_WINDOWS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS - + # DEFAULT_LINUX_CMAKE_OPTIONS: -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES # DEFAULT_MACOS_CMAKE_OPTIONS: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DENABLE_UPDATE_CHECK=YES # DEFAULT_WINDOWS_CMAKE_OPTIONS: -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES -DENABLE_UPDATE_CHECK=YES @@ -22,7 +22,7 @@ variables: ################################################# -# Platforms to test +# Platforms to test ################################################# .job-prepare: @@ -32,14 +32,14 @@ variables: include: - '.gitlab-ci-files/job-linux-prepare.yml' - '.gitlab-ci-files/job-linux-desktop.yml' - - '.gitlab-ci-files/job-linux-desktop-debian8.yml' - - '.gitlab-ci-files/job-linux-desktop-debian9.yml' +# - '.gitlab-ci-files/job-linux-desktop-debian8.yml' +# - '.gitlab-ci-files/job-linux-desktop-debian9.yml' ## - '.gitlab-ci-files/job-linux-desktop-debian10.yml' - - '.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml' - - '.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml' +# - '.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml' +# - '.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml' - '.gitlab-ci-files/job-linux-desktop-centos7.yml' - - '.gitlab-ci-files/job-windows-desktop.yml' - - '.gitlab-ci-files/job-macosx-desktop.yml' +# - '.gitlab-ci-files/job-windows-desktop.yml' +# - '.gitlab-ci-files/job-macosx-desktop.yml' # - '.gitlab-ci-files/job-linux.yml'