From 5a6c7b08f5dc238c7eabd9adca5d877fe0870a9f Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 25 May 2020 20:29:08 +0200 Subject: [PATCH] Update SDK 4.4 and add devtoolset-8 for centos7 --- .gitlab-ci-files/job-linux-desktop-centos7.yml | 5 +++++ linphone-sdk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci-files/job-linux-desktop-centos7.yml b/.gitlab-ci-files/job-linux-desktop-centos7.yml index 8e5e02c2d..9eec75bdc 100644 --- a/.gitlab-ci-files/job-linux-desktop-centos7.yml +++ b/.gitlab-ci-files/job-linux-desktop-centos7.yml @@ -41,6 +41,9 @@ job-centos7-ninja-gcc: CC: gcc CXX: g++ extends: .job-linux-desktop + before_script: + - source /opt/rh/devtoolset-8/enable + #job-centos7-ninja-clang: @@ -77,6 +80,8 @@ job-centos7-ninja-gcc-package: CC: gcc CXX: g++ extends: .job-linux-desktop + before_script: + - source /opt/rh/devtoolset-8/enable script: - echo "$GPG_SIGNING_PUB" > file.key && sed -i 's/\r /\n/g' file.key && chmod 600 file.key - gpg --import file.key diff --git a/linphone-sdk b/linphone-sdk index 207433fff..752772024 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 207433fffa0f4616e3b22371c3004a9debb325c2 +Subproject commit 75277202452c3af9b61f3c1e238e9d7c1bb72473