diff --git a/.gitlab-ci-files/job-android.yml b/.gitlab-ci-files/job-android.yml index fc361c145da0ef2e055cb6724bca4b6219bc28dc..cc331886fc4e3e6b4abf245bd990d22cc429e1c0 100644 --- a/.gitlab-ci-files/job-android.yml +++ b/.gitlab-ci-files/job-android.yml @@ -37,6 +37,10 @@ job-android-makefile-r16b: image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r16b + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS variables: CMAKE_GENERATOR: Unix Makefiles ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS @@ -46,6 +50,10 @@ job-android-makefile-r16b: job-android-makefile-r17c: image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r17c + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS variables: CMAKE_GENERATOR: Unix Makefiles ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS @@ -56,6 +64,10 @@ job-android-makefile-r17c: job-android-makefile-r18b: image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r18b + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS variables: CMAKE_GENERATOR: Unix Makefiles ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS @@ -65,6 +77,10 @@ job-android-makefile-r18b: job-android-makefile-r19: image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r19 + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS variables: CMAKE_GENERATOR: Unix Makefiles ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS @@ -79,6 +95,10 @@ job-android-makefile-r19: job-android-ninja-r16b: image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r16b + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS variables: CMAKE_GENERATOR: Ninja extends: .scheduled-job-android @@ -96,6 +116,9 @@ job-android-ninja-r16b-novideo: job-android-ninja-r17c: image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r17c + except: + variables: + - $DEPLOY_RUN_IOS variables: CMAKE_GENERATOR: Ninja CMAKE_OPTIONS: -DENABLE_AAUDIO=ON @@ -106,6 +129,10 @@ job-android-ninja-r17c-novideo: only: - schedules + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS variables: CMAKE_OPTIONS: -DENABLE_VIDEO=NO -DENABLE_AAUDIO=ON extends: job-android-ninja-r17c @@ -114,6 +141,10 @@ job-android-ninja-r17c-novideo: job-android-ninja-r18b: image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r18b + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS variables: CMAKE_GENERATOR: Ninja CMAKE_OPTIONS: -DENABLE_AAUDIO=ON @@ -123,6 +154,10 @@ job-android-ninja-r18b: job-android-ninja-r19: image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r19 + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS variables: CMAKE_GENERATOR: Ninja CMAKE_OPTIONS: -DENABLE_AAUDIO=ON diff --git a/.gitlab-ci-files/job-ios.yml b/.gitlab-ci-files/job-ios.yml index f351c659ef0892d8cb5082b332546cf3706c15d2..beecbbc7fe1b2695a398be6fb01d56f337b9c075 100644 --- a/.gitlab-ci-files/job-ios.yml +++ b/.gitlab-ci-files/job-ios.yml @@ -33,6 +33,11 @@ job-ios-makefile: + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS + variables: CMAKE_GENERATOR: Unix Makefiles ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS @@ -46,6 +51,11 @@ job-ios-makefile: job-ios-ninja: + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS + variables: CMAKE_GENERATOR: Ninja extends: .job-ios @@ -53,6 +63,11 @@ job-ios-ninja: job-ios-ninja-novideo: + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS + only: - schedules variables: @@ -70,6 +85,10 @@ job-ios-xcode: stage: build tags: [ "macosx" ] + except: + variables: + - $DEPLOY_RUN_ANDROID + only: - schedules script: diff --git a/.gitlab-ci-files/job-linux-desktop.yml b/.gitlab-ci-files/job-linux-desktop.yml index 5ecc0cb3595d783736b0c0bfb6a787791a456302..84864df953aede9851725b58ff84b569160509bb 100644 --- a/.gitlab-ci-files/job-linux-desktop.yml +++ b/.gitlab-ci-files/job-linux-desktop.yml @@ -3,6 +3,11 @@ stage: build extends: .linux-prepare + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS + script: - export CC=$CC - export CXX=$CXX diff --git a/.gitlab-ci-files/job-macosx.yml b/.gitlab-ci-files/job-macosx.yml index bf40fdb4e1c97a00ca8b835292528493cdfc2ea0..f0bd3446acfbbb585d09720b26eea4f1f0e1eeb0 100644 --- a/.gitlab-ci-files/job-macosx.yml +++ b/.gitlab-ci-files/job-macosx.yml @@ -4,6 +4,11 @@ stage: build tags: [ "macosx" ] + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS + script: - ccache -s - mkdir -p build-desktop @@ -59,6 +64,11 @@ job-macosx-xcode: stage: build tags: [ "macosx" ] + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS + only: - schedules script: diff --git a/.gitlab-ci-files/job-uploads.yml b/.gitlab-ci-files/job-uploads.yml index 5409aa59c86e536d6014005547d9f46c37df1eaf..cbec37a22d6a4db26260c4d0a8baacf7dc29a0a4 100644 --- a/.gitlab-ci-files/job-uploads.yml +++ b/.gitlab-ci-files/job-uploads.yml @@ -8,6 +8,10 @@ job-ios-upload: stage: deploy tags: [ "deploy" ] + except: + variables: + - $DEPLOY_RUN_ANDROID + only: - schedules dependencies: @@ -33,6 +37,10 @@ job-android-upload: tags: [ "docker-android" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r17c + except: + variables: + - $DEPLOY_RUN_IOS + variables: CCACHE_SIZE: 4G CMAKE_GENERATOR: Ninja diff --git a/.gitlab-ci-files/job-windows.yml b/.gitlab-ci-files/job-windows.yml index 646bf764af90bfc7c289a0b2e807e73ad8ef9b86..13c81eae0af34bcf0554db18a9ad9446b71ee3c7 100644 --- a/.gitlab-ci-files/job-windows.yml +++ b/.gitlab-ci-files/job-windows.yml @@ -8,6 +8,11 @@ job-windows-vs2015: stage: build tags: [ "windows" ] + except: + variables: + - $DEPLOY_RUN_ANDROID + - $DEPLOY_RUN_IOS + script: - mkdir build-desktop - cd build-desktop