diff options
| author | liuxueli <[email protected]> | 2020-11-10 09:36:00 +0600 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-11-10 09:36:00 +0600 |
| commit | 6efe7dc77fbdbb76062affdbf7e7228447d3bd69 (patch) | |
| tree | ea4bad75095bf53fb94754d3b29aa53a215776bb | |
| parent | 6749f758526820d5d3ed5b2f727b16bd250fc106 (diff) | |
| parent | f0cc671da2671e30e4fc80e9182671b6f4c94aac (diff) | |
Merge branch 'master' into develop-export-version
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | ci/travis.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbe113d..eecede0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,7 +67,6 @@ develop_build_release: BUILD_TYPE: RelWithDebInfo PACKAGE: 1 UPLOAD_RPM: 1 - ASAN_OPTION: ADDRESS TESTING_VERSION_BUILD: 1 PULP3_REPO_NAME: tsg-testing-x86_64.el7 PULP3_DIST_NAME: tsg-testing-x86_64.el7 diff --git a/ci/travis.sh b/ci/travis.sh index 60f79a2..d32c1c6 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -37,6 +37,11 @@ if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then yum install -y $INSTALL_DEPENDENCY_LIBRARY source /etc/profile.d/framework.sh fi + +if [ $ASAN_OPTION ];then + source /opt/rh/devtoolset-7/enable +fi + mkdir build || true cd build |