diff options
| -rw-r--r-- | .gitlab-ci.yml | 24 | ||||
| -rw-r--r-- | ci/travis.sh | 20 |
2 files changed, 25 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70737e2..ca73546 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,12 +74,12 @@ develop_build_release: - /^master.*$/i -release_build_release: +release_build_debug: stage: build variables: - BUILD_TYPE: RelWithDebInfo + BUILD_TYPE: Debug PACKAGE: 1 - UPLOAD: 1 + UPLOAD_RPM: 1 PULP3_REPO_NAME: framework-stable-x86_64.el7 PULP3_DIST_NAME: framework-stable-x86_64.el7 extends: .build_by_travis @@ -92,13 +92,14 @@ release_build_release: except: - /^v[0-9].*-testing$/i -release_build_release_devel: +release_build_release: stage: build variables: BUILD_TYPE: RelWithDebInfo - ENABLE_DEVEL_SWITCH: "ON" PACKAGE: 1 - UPLOAD: 1 + UPLOAD_RPM: 1 + UPLOAD_SYMBOL_FILES: 1 + SYMBOL_TARGET: libMESA_handle_logger PULP3_REPO_NAME: framework-stable-x86_64.el7 PULP3_DIST_NAME: framework-stable-x86_64.el7 extends: .build_by_travis @@ -111,12 +112,12 @@ release_build_release_devel: except: - /^v[0-9].*-testing$/i -testing_build_release: +testing_build_debug: stage: build variables: - BUILD_TYPE: RelWithDebInfo + BUILD_TYPE: Debug PACKAGE: 1 - UPLOAD: 1 + UPLOAD_RPM: 1 PULP3_REPO_NAME: framework-testing-x86_64.el7 PULP3_DIST_NAME: framework-testing-x86_64.el7 extends: .build_by_travis @@ -127,13 +128,12 @@ testing_build_release: only: - /^v[0-9].*-testing$/i -testing_build_release_devel: +testing_build_release: stage: build variables: BUILD_TYPE: RelWithDebInfo - ENABLE_DEVEL_SWITCH: "ON" PACKAGE: 1 - UPLOAD: 1 + UPLOAD_RPM: 1 PULP3_REPO_NAME: framework-testing-x86_64.el7 PULP3_DIST_NAME: framework-testing-x86_64.el7 extends: .build_by_travis diff --git a/ci/travis.sh b/ci/travis.sh index 64780e4..a89b07e 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -33,7 +33,10 @@ env | sort : "${COMPILER_IS_GNUCXX:=OFF}" # Install dependency from YUM -#yum install -y mrzcpd framework numactl-devel zlib-devel librdkafka-devel systemd-devel +if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then + yum install -y $INSTALL_DEPENDENCY_LIBRARY +fi + mkdir build || true cd build @@ -41,6 +44,8 @@ cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DENABLE_DEVEL=$ENABLE_DEVEL_SWITCH \ + -DASAN_OPTION=$ASAN_OPTION \ + -DVERSION_DAILY_BUILD=$TESTING_VERSION_BUILD \ .. make @@ -49,13 +54,14 @@ if [ -n "${PACKAGE}" ]; then make package fi -if [ -n "${UPLOAD}" ]; then +if [ -n "${UPLOAD_RPM}" ]; then cp ~/rpm_upload_tools.py ./ python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm fi -#if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then -# rpm -i tfe*debuginfo*.rpm -# cp /usr/lib/debug/opt/tsg/tfe/bin/tfe.debug /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA} -# sentry-cli upload-dif -t elf /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA} -#fi +if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then + rpm -i $SYMBOL_TARGET*debuginfo*.rpm + _symbol_file=`find /usr/lib/debug/ -name "$SYMBOL_TARGET*.so*.debug"` + cp $_symbol_file ${_symbol_file}info.${CI_COMMIT_SHORT_SHA} + sentry-cli upload-dif -t elf ${_symbol_file}info.${CI_COMMIT_SHORT_SHA} +fi
\ No newline at end of file |