mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-29 01:39:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add empty dependencies when needed and set CMAKE_INSTALL_LIBDIR to lib folder instead of lib64

Browse source
This commit is contained in:
Julien Wadel 2020-04-06 09:25:41 +02:00
parent 99690c8879
commit 5e8aa688cb
8 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml
View file

@ -1,6 +1,7 @@
job-archlinux-latest-ninja-clang:
tags: [ "docker-archlinux-latest" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest
dependencies: []
except:
refs:
- schedules
@ -17,6 +18,7 @@ job-archlinux-latest-ninja-clang:
job-archlinux-latest-makefile-gcc:
tags: [ "docker-archlinux-latest" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -30,6 +32,7 @@ job-archlinux-latest-makefile-gcc:
job-archlinux-latest-makefile-clang:
tags: [ "docker-archlinux-latest" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -43,6 +46,7 @@ job-archlinux-latest-makefile-clang:
job-archlinux-latest-ninja-gcc:
tags: [ "docker-archlinux-latest" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -54,6 +58,7 @@ job-archlinux-latest-ninja-gcc:
job-archlinux-latest-ninja-gcc-novideo:
tags: [ "docker-archlinux-latest" ]
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -64,6 +69,7 @@ job-archlinux-latest-ninja-gcc-novideo:
job-archlinux-latest-ninja-clang-novideo:
tags: [ "docker-archlinux-latest" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest
dependencies: []
only:
variables:
- $NIGHTLY_MASTER

6
.gitlab-ci-files/job-linux-desktop-centos7.yml
View file

@ -32,10 +32,12 @@
job-centos7-ninja-gcc:
tags: [ "docker" ]
image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-qt-fuse-wget:5.12.5
dependencies: []
except:
refs:
- schedules
variables:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DCMAKE_INSTALL_LIBDIR=lib
CMAKE_GENERATOR: Ninja
CC: gcc
CXX: g++
@ -65,12 +67,13 @@ job-centos7-ninja-gcc-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-desktop/bc-dev-centos7-qt-fuse-wget:5.12.5
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
- $DEPLOY_LINUX
variables:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DCMAKE_INSTALL_LIBDIR=lib
CMAKE_GENERATOR: Ninja
CC: gcc
CXX: g++
@ -105,6 +108,7 @@ job-centos7-debug:
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-desktop/bc-dev-centos7-qt-fuse-wget:5.12.5
dependencies: []
only:
variables:
- $DEBUG_CENTOS7

7
.gitlab-ci-files/job-linux-desktop-debian10.yml
View file

@ -2,6 +2,7 @@
job-debian10-ninja-gcc:
tags: [ "docker-debian10" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10
dependencies: []
except:
refs:
- schedules
@ -18,6 +19,7 @@ job-debian10-ninja-gcc:
job-debian10-makefile-gcc:
tags: [ "docker-debian10" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -32,6 +34,7 @@ job-debian10-makefile-gcc:
job-debian10-ninja-gcc-novideo:
tags: [ "docker-debian10" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -46,6 +49,7 @@ job-debian10-ninja-gcc-novideo:
job-debian10-ninja-gcc-smallsdk:
tags: [ "docker-debian10" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -59,6 +63,7 @@ job-debian10-ninja-gcc-smallsdk:
job-debian10-ninja-clang:
tags: [ "docker-debian10" ]
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -71,6 +76,7 @@ job-debian10-ninja-clang:
job-debian10-ninja-clang-novideo:
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -81,6 +87,7 @@ job-debian10-ninja-clang-novideo:
job-debian10-makefile-clang:
tags: [ "docker-debian10" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10
dependencies: []
only:
variables:
- $NIGHTLY_MASTER

2
.gitlab-ci-files/job-linux-desktop-debian8.yml
View file

@ -5,6 +5,7 @@
job-debian8-makefile-gcc:
tags: [ "docker-debian8" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8
dependencies: []
except:
refs:
- schedules
@ -20,6 +21,7 @@ job-debian8-makefile-gcc:
job-debian8-makefile-clang:
tags: [ "docker-debian8" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8
dependencies: []
only:
variables:
- $NIGHTLY_MASTER

7
.gitlab-ci-files/job-linux-desktop-debian9.yml
View file

@ -3,6 +3,7 @@
job-debian9-ninja-gcc:
tags: [ "docker-debian9" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9
dependencies: []
except:
refs:
- schedules
@ -14,6 +15,7 @@ job-debian9-ninja-gcc:
job-debian9-ninja-gcc-smallsdk:
dependencies: []
except:
refs:
- schedules
@ -27,6 +29,7 @@ job-debian9-ninja-gcc-smallsdk:
#################################################
job-debian9-makefile-gcc:
dependencies: []
tags: [ "docker-debian9" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9
only:
@ -40,6 +43,7 @@ job-debian9-makefile-gcc:
extends: .job-linux-desktop
job-debian9-ninja-gcc-novideo:
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -50,6 +54,7 @@ job-debian9-ninja-gcc-novideo:
job-debian9-ninja-clang:
tags: [ "docker-debian9" ]
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -62,6 +67,7 @@ job-debian9-ninja-clang:
extends: .job-linux-desktop
job-debian9-ninja-clang-novideo:
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -72,6 +78,7 @@ job-debian9-ninja-clang-novideo:
job-debian9-makefile-clang:
tags: [ "docker-debian9" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9
dependencies: []
only:
variables:
- $NIGHTLY_MASTER

6
.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml
View file

@ -2,6 +2,7 @@
job-ubuntu-rolling-ninja-clang:
tags: [ "docker-ubuntu-rolling" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling
dependencies: []
except:
refs:
- schedules
@ -21,6 +22,7 @@ job-ubuntu-rolling-ninja-clang:
job-ubuntu-rolling-makefile-gcc:
tags: [ "docker-ubuntu-rolling" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -35,6 +37,7 @@ job-ubuntu-rolling-makefile-gcc:
job-ubuntu-rolling-makefile-clang:
tags: [ "docker-ubuntu-rolling" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -49,6 +52,7 @@ job-ubuntu-rolling-makefile-clang:
job-ubuntu-rolling-ninja-gcc:
tags: [ "docker-ubuntu-rolling" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -60,6 +64,7 @@ job-ubuntu-rolling-ninja-gcc:
job-ubuntu-rolling-ninja-gcc-novideo:
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -69,6 +74,7 @@ job-ubuntu-rolling-ninja-gcc-novideo:
job-ubuntu-rolling-ninja-clang-novideo:
dependencies: []
only:
variables:
- $NIGHTLY_MASTER

4
.gitlab-ci-files/job-macosx-desktop.yml
View file

@ -40,6 +40,7 @@ job-macosx-ninja:
variables:
CMAKE_GENERATOR: Ninja
extends: .job-macosx-desktop
dependencies: []
#################################################
# Nightly
@ -53,6 +54,7 @@ job-macosx-makefile:
CMAKE_GENERATOR: Unix Makefiles
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .job-macosx-desktop
dependencies: []
job-macosx-ninja-novideo:
only:
@ -62,6 +64,7 @@ job-macosx-ninja-novideo:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
CMAKE_GENERATOR: Ninja
extends: .job-macosx-desktop
dependencies: []
#job-macosx-xcode:
# extends: .job-macosx-desktop
@ -82,6 +85,7 @@ job-macosx-ninja-novideo:
job-macosx-makefile-package:
stage: package
tags: [ "macosx-xcode11" ]
dependencies: []
only:
variables:
- $NIGHTLY_MASTER

2
.gitlab-ci-files/job-windows-desktop.yml
View file

@ -106,6 +106,7 @@ job-windows-vs2017-novideo:
job-windows-vs2017-package:
stage: package
tags: [ "windows" ]
dependencies: []
only:
variables:
- $NIGHTLY_MASTER
@ -131,7 +132,6 @@ job-windows-vs2017-package:
- cd OUTPUT
- cd Packages
- copy /B *.exe "%CI_PROJECT_DIR%/results"
artifacts:
paths:
- results\*