From efc2e63ec3fdfbe6338dfcd72cb77cd8eb151464 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 30 Jul 2020 17:09:41 +0200 Subject: [PATCH] Update SDK to 4.4 with opus crashfix Fix CI variable --- .gitlab-ci-files/job-linux-desktop-debian9.yml | 2 +- .gitlab-ci-files/job-macosx-desktop.yml | 2 +- .gitlab-ci-files/job-windows-desktop.yml | 2 +- linphone-app/CMakeLists.txt | 2 +- linphone-sdk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci-files/job-linux-desktop-debian9.yml b/.gitlab-ci-files/job-linux-desktop-debian9.yml index 527f1c771..0db3562f8 100644 --- a/.gitlab-ci-files/job-linux-desktop-debian9.yml +++ b/.gitlab-ci-files/job-linux-desktop-debian9.yml @@ -139,7 +139,7 @@ job-debian9-makefile-clang-deploy: - $NIGHTLY_MASTER - $DEPLOY_LINUX script: - - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$APPIMAGE_DEPLOY_SNAPSHOTS_PATH/ + - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$APPIMAGE_UPLOAD_DIRECTORY/ ################################################# # Debug diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml index f91d86e97..0b877bad4 100644 --- a/.gitlab-ci-files/job-macosx-desktop.yml +++ b/.gitlab-ci-files/job-macosx-desktop.yml @@ -114,4 +114,4 @@ job-macosx-makefile-deploy: - $NIGHTLY_MASTER - $DEPLOY_MACOSX script: - - rsync -rlv --ignore-existing build/OUTPUT/Packages/Linphone*.dmg $DEPLOY_SERVER:$MACOSX_DEPLOY_SNAPSHOTS_PATH + - rsync -rlv --ignore-existing build/OUTPUT/Packages/Linphone*.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY diff --git a/.gitlab-ci-files/job-windows-desktop.yml b/.gitlab-ci-files/job-windows-desktop.yml index 0357c7dd3..4a604faa3 100644 --- a/.gitlab-ci-files/job-windows-desktop.yml +++ b/.gitlab-ci-files/job-windows-desktop.yml @@ -98,7 +98,7 @@ job-windows-vs2017-win32-upload: dependencies: - job-windows-vs2017-package script: - - scp "results/*.exe" "%DEPLOY_SERVER%:%WINDOWS_DEPLOY_SNAPSHOTS_PATH%" + - scp "results/*.exe" "%DEPLOY_SERVER%:%WINDOWS_UPLOAD_DIRECTORY%" diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 41e70aa21..5d884b847 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -21,7 +21,7 @@ ################################################################################ cmake_minimum_required(VERSION 3.1) -project(linphoneqt VERSION 4.2.1) +project(linphoneqt VERSION 4.2.2) if(ENABLE_BUILD_VERBOSE) #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") diff --git a/linphone-sdk b/linphone-sdk index efa8a5f1d..0197fa644 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit efa8a5f1da39c9e4ce55b4c069da2e090078111c +Subproject commit 0197fa6443dd175ab2c8b1e839a526173a677f95