Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
a379ed99
Commit
a379ed99
authored
May 07, 2019
by
Antoine Regimbeau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove branches in yaml and add test in configure option
parent
dcdfa001
Pipeline
#1360
failed with stages
in 40 minutes and 33 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
.gitlab-ci.yml
.gitlab-ci.yml
+2
-2
CI/configure_options.cmake
CI/configure_options.cmake
+2
-2
No files found.
.gitlab-ci.yml
View file @
a379ed99
...
...
@@ -81,7 +81,7 @@ ubuntu-llvm:
.common-prepare
:
extends
:
.general
only
:
[
merge_requests
,
branches
]
only
:
[
merge_requests
]
stage
:
prepare
before_script
:
# This override the previous before_script
...
...
@@ -118,7 +118,7 @@ centos-superbuild-prepare:
-
ctest -V -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
.superbuild-build
:
only
:
[
merge_requests
,
branches
]
only
:
[
merge_requests
]
extends
:
.common-build
artifacts
:
expire_in
:
1 week
...
...
CI/configure_options.cmake
View file @
a379ed99
...
...
@@ -27,9 +27,9 @@
set
(
otb_build_project_option
"BUILD_COOKBOOK:BOOL=OFF
BUILD_EXAMPLES:BOOL=O
FF
BUILD_EXAMPLES:BOOL=O
N
BUILD_SHARED_LIBS:BOOL=ON
BUILD_TESTING:BOOL=O
FF
"
)
BUILD_TESTING:BOOL=O
N
"
)
set
(
otb_use_option
"OTB_USE_6S:BOOL=ON
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment