From 4a37922785d8aab214cb647e135715efef032b83 Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau <antoine.regimbeau@c-s.fr> Date: Thu, 21 Mar 2019 17:39:11 +0100 Subject: [PATCH] CI: debian build for MR only --- .gitlab-ci.yml | 1 + CI/debian-unstable-gcc.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e06706557..ed97a6699f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ native-build: debian-build: extends: .general + only: [merge_requests] stage: build image: registry.orfeo-toolbox.org/gbonnefille/otb-build-env/otb-debian-native:unstable script: diff --git a/CI/debian-unstable-gcc.cmake b/CI/debian-unstable-gcc.cmake index 7c028d94e8..e1579da20d 100644 --- a/CI/debian-unstable-gcc.cmake +++ b/CI/debian-unstable-gcc.cmake @@ -18,7 +18,7 @@ # limitations under the License. # -# Configuration options for ubuntu-18.04-gcc-shark-3.1.4 +# Configuration options for debian-unstable-gcc set(site_option "opencv_INCLUDE_DIR:PATH=/usr/include -- GitLab