From 406d1947621274163f32c6504288efe2bf55a7a1 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 12 Dec 2018 14:32:34 +0100 Subject: [PATCH] Add ubuntu for CI. --- .gitlab-ci.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ linphone-sdk | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d382cbc7..90c36cd9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,6 +90,52 @@ job-debian9-ninja-clang: extends: .job-linux-desktop +job-ubuntu-rolling-makefile-gcc: + + tags: [ "docker-ubuntu-rolling" ] + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling + variables: + CMAKE_GENERATOR: Unix Makefiles + CC: gcc + CXX: g++ + ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS + extends: .scheduled-job-linux-desktop + + +job-ubuntu-rolling-makefile-clang: + + tags: [ "docker-ubuntu-rolling" ] + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling + variables: + CMAKE_GENERATOR: Unix Makefiles + CC: clang + CXX: clang++ + ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS + extends: .scheduled-job-linux-desktop + + +job-ubuntu-rolling-ninja-gcc: + + tags: [ "docker-ubuntu-rolling" ] + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling + variables: + CMAKE_GENERATOR: Ninja + CC: gcc + CXX: g++ + extends: .job-linux-desktop + + +job-ubuntu-rolling-ninja-clang: + + tags: [ "docker-ubuntu-rolling" ] + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling + variables: + CMAKE_GENERATOR: Ninja + CC: clang + CXX: clang++ + extends: .job-linux-desktop + + .job-macosx: tags: [ "macosx" ] diff --git a/linphone-sdk b/linphone-sdk index d05e455c7..aed01272d 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit d05e455c7008402600957a24b6e5f3990fbf5c2b +Subproject commit aed01272d798738407b932a94b711974c6f82dd2