Commit ace473b4 authored by Antoine Regimbeau's avatar Antoine Regimbeau

Merge branch 'develop' into 1834-test-data-lfs

parents ec3e4bca 943cfaa5
Pipeline #462 canceled with stage
in 49 seconds
......@@ -20,60 +20,9 @@ native-build:
script:
- ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc
.build-common:
build:ubuntu-llvm:
extends: .general
stage: build
image: registry.orfeo-toolbox.org/gbonnefille/otb-build-env/otb-ubuntu-shark:18.04
before_script:
# ccache configuration
- mkdir -p ccache
- export CCACHE_BASEDIR=${PWD}
- export CCACHE_DIR=${PWD}/ccache
- echo "max_size = 3G" > ccache/ccache.conf
- echo "run_second_cpp = true" >> ccache/ccache.conf
- echo "compiler_check = content" >> ccache/ccache.conf
- echo "sloppiness = time_macros" >> ccache/ccache.conf
script:
- ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm-shark
cache:
key: "ubuntu-18.04-llvm-shark"
paths:
- ccache/
build-wip:
extends: .build-common
variables:
OTB_CI_PROFILE: 'wip'
except:
- merge_requests
- develop
- /^release-[0-9]+\.[0-9]+$/
cache:
policy: pull
build-mr:
extends: .build-common
variables:
OTB_CI_PROFILE: 'mr'
only:
- merge_requests
cache:
policy: pull
build-develop:
extends: .build-common
variables:
OTB_CI_PROFILE: 'develop'
only:
- develop
cache:
policy: pull-push
build-release:
extends: .build-common
variables:
OTB_CI_PROFILE: 'release'
only:
- /^release-[0-9]+\.[0-9]+$/
cache:
policy: pull
......@@ -26,15 +26,22 @@ set (ENV{LANG} "C") # Only ascii output
set (CTEST_BUILD_CONFIGURATION "Release")
set (CTEST_CMAKE_GENERATOR "Ninja")
# Find the build name
# Find the build name and CI profile
set(ci_profile wip)
set(ci_mr_source "$ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}")
set(ci_mr_target "$ENV{CI_MERGE_REQUEST_TARGET_BRANCH_NAME}")
set(ci_ref_name "$ENV{CI_COMMIT_REF_NAME}")
set (CTEST_BUILD_NAME "$ENV{CI_COMMIT_SHORT_SHA}")
if(ci_mr_source AND ci_mr_target)
set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} (${ci_mr_source} to ${ci_mr_target})")
set(ci_profile mr)
elseif(ci_ref_name)
set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} (${ci_ref_name})")
if("${ci_ref_name}" STREQUAL "develop")
set(ci_profile develop)
elseif("${ci_ref_name}" MATCHES "^release-[0-9]+\\.[0-9]+\$")
set(ci_profile release)
endif()
endif()
set (CTEST_SITE "${IMAGE_NAME}")
......@@ -51,7 +58,7 @@ set (CMAKE_COMMAND "cmake")
# Data directory setting
set (OTB_LARGEINPUT_ROOT "") # todo
message(STATUS "CI profile : $ENV{OTB_CI_PROFILE}")
message(STATUS "CI profile : ${ci_profile}")
#The following file set the CONFIGURE_OPTIONS variable
set (CONFIGURE_OPTIONS "")
......
......@@ -188,7 +188,11 @@ public:
*
* \f]
* */
#ifdef ITKV3_COMPATIBILITY
const JacobianType & GetJacobian(const InputPointType &) const override
#else
virtual const JacobianType & GetJacobian(const InputPointType &) const
#endif
{
itkExceptionMacro( << "Subclass should override this method (GetJacobian)" );
// Next line is needed to avoid errors due to:
......
......@@ -81,9 +81,9 @@ def checkGroup( fname, group ):
# we don't care about doxygen fields not about a class
if r"\class" in dcontent and dcontent != " \class classname ":
# do we have a line with the expected content?
if not re.search(r"\ingroup .*"+group+"( |$)", dcontent, re.MULTILINE):
if not re.search(r"\\ingroup .*"+group+"( |$)", dcontent, re.MULTILINE):
# get class name and the line for debug output
cname = re.search(r"\class +([^ ]*)", dcontent).group(1).strip()
cname = re.search(r"\\class +([^ ]*)", dcontent).group(1).strip()
line = len(fcontent[:m.start(1)].splitlines())
sys.stderr.write(r'%s:%s: error: "\ingroup %s" not set in class %s.' % (fname, line, group, cname) +"\n")
ret = 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment