diff options
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | ci/travis.sh | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61db797..437d956 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,8 @@ branch_build_debug: extends: .build_by_travis variables: BUILD_TYPE: Debug + CAPTURE_MODE: MARSIO + PLATFORM_MODE: INLINE except: - /^develop.*$/i - /^master.*$/i @@ -34,6 +36,8 @@ branch_build_release: stage: build variables: BUILD_TYPE: RelWithDebInfo + CAPTURE_MODE: MARSIO + PLATFORM_MODE: INLINE extends: .build_by_travis except: - /^develop.*$/i @@ -45,6 +49,8 @@ develop_build_debug: extends: .build_by_travis variables: BUILD_TYPE: Debug + CAPTURE_MODE: MARSIO + PLATFORM_MODE: INLINE PACKAGE: 1 artifacts: name: "sapp-$CI_COMMIT_REF_NAME-debug" @@ -59,6 +65,8 @@ develop_build_release: extends: .build_by_travis variables: BUILD_TYPE: RelWithDebInfo + CAPTURE_MODE: MARSIO + PLATFORM_MODE: INLINE PACKAGE: 1 artifacts: name: "sapp-$CI_COMMIT_REF_NAME-release" @@ -73,6 +81,8 @@ release_build_release: stage: build variables: BUILD_TYPE: RelWithDebInfo + CAPTURE_MODE: MARSIO + PLATFORM_MODE: INLINE PACKAGE: 1 UPLOAD: 1 PULP3_REPO_NAME: platform-stable-x86_64.el7 diff --git a/ci/travis.sh b/ci/travis.sh index c9d2f27..2fca6d5 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -33,6 +33,7 @@ env | sort : "${COMPILER_IS_GNUCXX:=OFF}" # Install dependency from YUM +yum install -y mrzcpd numactl-devel zlib-devel librdkafka-devel systemd-devel yum install libMESA_htable-devel libMESA_prof_load-devel libcjson-devel libMESA_field_stat2-devel framework_env libwiredcfg-devel libWiredLB-devel libMESA_handle_logger-devel -y source /etc/profile.d/framework.sh @@ -40,6 +41,8 @@ mkdir build || true cd build cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ + -DCAPTURE_MODE=$CAPTURE_MODE \ + -DPLATFORM_MODE=$PLATFORM_MODE \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DENABLE_DEVEL=$ENABLE_DEVEL_SWITCH \ |