diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b81b82cc..cf6d2f3a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,120 +1,120 @@ -variables: - GIT_SUBMODULE_STRATEGY: recursive +#variables: + #GIT_SUBMODULE_STRATEGY: recursive -.linux-ccache: - cache: - key: $CI_JOB_NAME - paths: - - ccache/ +#.linux-ccache: + #cache: + #key: $CI_JOB_NAME + #paths: + #- ccache/ - before_script: - - mkdir -p ccache - - export CCACHE_BASEDIR=${PWD} - - export CCACHE_DIR=${PWD}/ccache + #before_script: + #- mkdir -p ccache + #- export CCACHE_BASEDIR=${PWD} + #- export CCACHE_DIR=${PWD}/ccache -.job-linux-desktop: +#.job-linux-desktop: - tags: [ "docker" ] + #tags: [ "docker" ] - extends: .linux-ccache + #extends: .linux-ccache - script: - - export CC=$CC - - export CXX=$CXX - - ccache -s - - ./prepare.py -G "$CMAKE_GENERATOR" -cc -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES - - cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS - - ccache -s + #script: + #- export CC=$CC + #- export CXX=$CXX + #- ccache -s + #- ./prepare.py -G "$CMAKE_GENERATOR" -cc -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES + #- cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS + #- ccache -s -.scheduled-job-linux-desktop: +#.scheduled-job-linux-desktop: - extends: .job-linux-desktop - only: - - schedules + #extends: .job-linux-desktop + #only: + #- schedules -job-debian9-makefile-gcc: +#job-debian9-makefile-gcc: - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - extends: .scheduled-job-linux-desktop + #image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 + #variables: + #CMAKE_GENERATOR: Unix Makefiles + #CC: gcc + #CXX: g++ + #extends: .scheduled-job-linux-desktop -job-debian9-makefile-clang: +#job-debian9-makefile-clang: - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - extends: .scheduled-job-linux-desktop + #image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 + #variables: + #CMAKE_GENERATOR: Unix Makefiles + #CC: clang + #CXX: clang++ + #extends: .scheduled-job-linux-desktop -job-debian9-ninja-gcc: +#job-debian9-ninja-gcc: - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Ninja - CC: gcc - CXX: g++ - extends: .job-linux-desktop + #image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 + #variables: + #CMAKE_GENERATOR: Ninja + #CC: gcc + #CXX: g++ + #extends: .job-linux-desktop -job-debian9-ninja-clang: +#job-debian9-ninja-clang: - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Ninja - CC: clang - CXX: clang++ - extends: .job-linux-desktop + #image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 + #variables: + #CMAKE_GENERATOR: Ninja + #CC: clang + #CXX: clang++ + #extends: .job-linux-desktop -.job-macosx: +#.job-macosx: - tags: [ "macosx" ] + #tags: [ "macosx" ] - script: - - ccache -s - - export Qt5_DIR=/usr/local/opt/qt/lib/cmake - - export PATH=$PATH:/usr/local/opt/qt/bin - - python prepare.py -G "$CMAKE_GENERATOR" -cc --package -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DENABLE_UPDATE_CHECK=YES - - cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS - - ccache -s + #script: + #- ccache -s + #- export Qt5_DIR=/usr/local/opt/qt/lib/cmake + #- export PATH=$PATH:/usr/local/opt/qt/bin + #- python prepare.py -G "$CMAKE_GENERATOR" -cc --package -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DENABLE_UPDATE_CHECK=YES + #- cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS + #- ccache -s - artifacts: - paths: - - WORK/desktop/Build/linphone_package/Linphone-*.dmg - - WORK/desktop/Build/linphone_package/linphone-sdk-*-mac.zip - when: always - expire_in: 1 week + #artifacts: + #paths: + #- WORK/desktop/Build/linphone_package/Linphone-*.dmg + #- WORK/desktop/Build/linphone_package/linphone-sdk-*-mac.zip + #when: always + #expire_in: 1 week -.scheduled-job-macosx: +#.scheduled-job-macosx: - extends: .job-macosx - only: - - schedules + #extends: .job-macosx + #only: + #- schedules -job-macosx-makefile: +#job-macosx-makefile: - variables: - CMAKE_GENERATOR: Unix Makefiles - extends: .scheduled-job-macosx + #variables: + #CMAKE_GENERATOR: Unix Makefiles + #extends: .scheduled-job-macosx -job-macosx-ninja: +#job-macosx-ninja: - variables: - CMAKE_GENERATOR: Ninja - extends: .job-macosx + #variables: + #CMAKE_GENERATOR: Ninja + #extends: .job-macosx job-macosx-xcode: @@ -126,8 +126,9 @@ job-macosx-xcode: script: - export Qt5_DIR=/usr/local/opt/qt/lib/cmake - export PATH=$PATH:/usr/local/opt/qt/bin - - python prepare.py -G Xcode -cc --package -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DENABLE_UPDATE_CHECK=YES + - python prepare.py -G Xcode -cc --package -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DENABLE_UPDATE_CHECK=YES -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" - cmake --build WORK/desktop/cmake -- -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=`sysctl -n hw.ncpu` + - if [ "$MACOS_SIGNING_IDENTITY" != "" ]; then security unlock-keychain -p $MACOS_UNLOCK_KEYCHAIN_PASSWORD login.keychain && codesign --verbose -s "$MACOS_SIGNING_IDENTITY" WORK/desktop/Build/linphone_package/Linphone-*.dmg; fi artifacts: paths: @@ -137,17 +138,18 @@ job-macosx-xcode: expire_in: 1 week -job-windows-vs2015: +#job-windows-vs2015: - tags: [ "windows" ] + #tags: [ "windows" ] - script: - - echo %Qt5_DIR% - - echo %PATH% - - python prepare.py -G "Visual Studio 14 2015" --package -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES -DENABLE_UPDATE_CHECK=YES - - cmake --build WORK/desktop/cmake --config Release -- /maxcpucount + #script: + #- echo %Qt5_DIR% + #- echo %PATH% + #- if DEFINED WINDOWS_SIGNING_DIRECTORY ( xcopy /I /Y "%WINDOWS_SIGNING_DIRECTORY%" "cmake_builder\\linphone_package\\sign" ) + #- python prepare.py -G "Visual Studio 14 2015" --package -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES -DENABLE_UPDATE_CHECK=YES + #- cmake --build WORK/desktop/cmake --config Release -- /maxcpucount - artifacts: - paths: - - WORK/desktop/Build/linphone_package/Linphone-*-win32.exe - expire_in: 1 week + #artifacts: + #paths: + #- WORK/desktop/Build/linphone_package/Linphone-*-win32.exe + #expire_in: 1 week