diff options
| author | luwenpeng <[email protected]> | 2023-05-06 14:56:29 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2023-05-06 14:56:35 +0800 |
| commit | 0aa8f70df7a74743b86658bb4623b3d4d900b8b4 (patch) | |
| tree | 4ae9002ea02df45edc92df9cd46c7546084fdbe1 | |
| parent | bd899c08f1f5854b6c899fe61c7fd861e3100b53 (diff) | |
更新CI配置v1.0.9-20230506
* 禁用UPLOAD_SYMBOL_FILES
* ASAN_OPTION兼容CentOS7/RockLinux8.5
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | ci/travis.sh | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a93bb1a..a05c946 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ develop_build_debug_for_centos7: extends: .build_by_travis_for_centos7 variables: TESTING_VERSION_BUILD: 1 - UPLOAD_SYMBOL_FILES: 1 + #UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug ASAN_OPTION: ADDRESS PACKAGE: 1 @@ -70,7 +70,7 @@ develop_build_release_for_centos7: extends: .build_by_travis_for_centos7 variables: TESTING_VERSION_BUILD: 1 - UPLOAD_SYMBOL_FILES: 1 + #UPLOAD_SYMBOL_FILES: 1 ASAN_OPTION: ADDRESS BUILD_TYPE: RelWithDebInfo PACKAGE: 1 @@ -87,7 +87,7 @@ develop_build_release_for_centos7: release_build_debug_for_centos7: stage: build variables: - UPLOAD_SYMBOL_FILES: 1 + #UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug PACKAGE: 1 PULP3_REPO_NAME: tsg-stable-x86_64.el7 @@ -104,7 +104,7 @@ release_build_release_for_centos7: stage: build variables: BUILD_TYPE: RelWithDebInfo - UPLOAD_SYMBOL_FILES: 1 + #UPLOAD_SYMBOL_FILES: 1 PACKAGE: 1 PULP3_REPO_NAME: tsg-stable-x86_64.el7 PULP3_DIST_NAME: tsg-stable-x86_64.el7 @@ -158,7 +158,7 @@ develop_build_debug_for_centos8: extends: .build_by_travis_for_centos8 variables: TESTING_VERSION_BUILD: 1 - UPLOAD_SYMBOL_FILES: 1 + #UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug ASAN_OPTION: ADDRESS PACKAGE: 1 @@ -177,7 +177,7 @@ develop_build_release_for_centos8: extends: .build_by_travis_for_centos8 variables: TESTING_VERSION_BUILD: 1 - UPLOAD_SYMBOL_FILES: 1 + #UPLOAD_SYMBOL_FILES: 1 ASAN_OPTION: ADDRESS BUILD_TYPE: RelWithDebInfo PACKAGE: 1 @@ -194,7 +194,7 @@ develop_build_release_for_centos8: release_build_debug_for_centos8: stage: build variables: - UPLOAD_SYMBOL_FILES: 1 + #UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug PACKAGE: 1 PULP3_REPO_NAME: tsg-stable-x86_64.el8 @@ -211,7 +211,7 @@ release_build_release_for_centos8: stage: build variables: BUILD_TYPE: RelWithDebInfo - UPLOAD_SYMBOL_FILES: 1 + #UPLOAD_SYMBOL_FILES: 1 PACKAGE: 1 PULP3_REPO_NAME: tsg-stable-x86_64.el8 PULP3_DIST_NAME: tsg-stable-x86_64.el8 diff --git a/ci/travis.sh b/ci/travis.sh index 3b5351a..11b137f 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -40,10 +40,10 @@ yum install -y libMESA_handle_logger-devel yum install -y libMESA_prof_load-devel yum install -y libMESA_field_stat2-devel yum install -y numactl-libs # required by mrzcpd -yum install -y libibverbs # required by mrzcpd +yum install -y libibverbs # required by mrzcpd yum install -y libbreakpad_mini-devel -if [ $ASAN_OPTION ]; then +if [ $ASAN_OPTION ] && [ -f "/opt/rh/devtoolset-7/enable" ]; then source /opt/rh/devtoolset-7/enable fi |