From 0cc17e6f76d74584c73a3bd4f5e6f4e00ef04fd2 Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Mon, 21 Feb 2022 17:06:24 +0800 Subject: [PATCH] =?UTF-8?q?TSG-9684=20hasp=5Fupdate=E8=BF=90=E8=A1=8CCI?= =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=97=B6=E6=9E=84=E5=BB=BACentOS7/CentOS8?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83=E7=9A=84=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 141 ++++++++++++++++++++++++++++++++++++++++++++----- CMakeLists.txt | 2 + ci/travis.sh | 3 +- 3 files changed, 130 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b773e30..a1826e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,28 +1,35 @@ -image: "git.mesalab.cn:7443/mesa_platform/build-env:master" variables: GIT_STRATEGY: "clone" BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ INSTALL_PREFIX: "/opt/tsg/hasp_update" TESTING_VERSION_BUILD: 0 + BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master" + BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux" stages: - build -.build_by_travis: +############################################################################### +# compile use image: build-env:master +############################################################################### + +.build_by_travis_for_centos7: + image: $BUILD_IMAGE_CENTOS7 before_script: - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/ - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH - chmod +x ./ci/travis.sh + - yum install -y elfutils-libelf-devel script: - yum makecache - ./ci/travis.sh tags: - share -branch_build_debug: +branch_build_debug_centos7: stage: build - extends: .build_by_travis + extends: .build_by_travis_for_centos7 variables: BUILD_TYPE: Debug except: @@ -30,19 +37,19 @@ branch_build_debug: - /^release-.*$/i - tags -branch_build_release: +branch_build_release_centos7: stage: build variables: BUILD_TYPE: RelWithDebInfo - extends: .build_by_travis + extends: .build_by_travis_for_centos7 except: - /^develop-.*$/i - /^release-.*$/i - tags -develop_build_debug: +develop_build_debug_centos7: stage: build - extends: .build_by_travis + extends: .build_by_travis_for_centos7 variables: TESTING_VERSION_BUILD: 1 UPLOAD_SYMBOL_FILES: 1 @@ -58,9 +65,9 @@ develop_build_debug: - /^develop-.*$/i - /^release-.*$/i -develop_build_release: +develop_build_release_centos7: stage: build - extends: .build_by_travis + extends: .build_by_travis_for_centos7 variables: TESTING_VERSION_BUILD: 1 UPLOAD_SYMBOL_FILES: 1 @@ -76,7 +83,7 @@ develop_build_release: - /^develop-.*$/i - /^release-.*$/i -release_build_debug: +release_build_debug_centos7: stage: build variables: UPLOAD_SYMBOL_FILES: 1 @@ -84,7 +91,7 @@ release_build_debug: PACKAGE: 1 PULP3_REPO_NAME: tsg-stable-x86_64.el7 PULP3_DIST_NAME: tsg-stable-x86_64.el7 - extends: .build_by_travis + extends: .build_by_travis_for_centos7 artifacts: name: "hasp_update-install-$CI_COMMIT_REF_NAME-debug" paths: @@ -92,7 +99,7 @@ release_build_debug: only: - tags -release_build_release: +release_build_release_centos7: stage: build variables: BUILD_TYPE: RelWithDebInfo @@ -100,10 +107,116 @@ release_build_release: PACKAGE: 1 PULP3_REPO_NAME: tsg-stable-x86_64.el7 PULP3_DIST_NAME: tsg-stable-x86_64.el7 - extends: .build_by_travis + extends: .build_by_travis_for_centos7 artifacts: name: "hasp_update-install-$CI_COMMIT_REF_NAME-release" paths: - build/*.rpm only: - tags + +############################################################################### +# compile use image: build-env:rockylinux" +############################################################################### + +.build_by_travis_for_centos8: + image: $BUILD_IMAGE_CENTOS8 + before_script: + - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/ + - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH + - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH + - chmod +x ./ci/travis.sh + - yum install -y elfutils-libelf-devel + script: + - yum makecache + - ./ci/travis.sh + tags: + - share + +branch_build_debug_centos8: + stage: build + extends: .build_by_travis_for_centos8 + variables: + BUILD_TYPE: Debug + except: + - /^develop-.*$/i + - /^release-.*$/i + - tags + +branch_build_release_centos8: + stage: build + variables: + BUILD_TYPE: RelWithDebInfo + extends: .build_by_travis_for_centos8 + except: + - /^develop-.*$/i + - /^release-.*$/i + - tags + +develop_build_debug_centos8: + stage: build + extends: .build_by_travis_for_centos8 + variables: + TESTING_VERSION_BUILD: 1 + UPLOAD_SYMBOL_FILES: 1 + BUILD_TYPE: Debug + PACKAGE: 1 + PULP3_REPO_NAME: tsg-testing-x86_64.el8 + PULP3_DIST_NAME: tsg-testing-x86_64.el8 + artifacts: + name: "hasp_update-develop-$CI_COMMIT_REF_NAME-debug" + paths: + - build/*.rpm + only: + - /^develop-.*$/i + - /^release-.*$/i + +develop_build_release_centos8: + stage: build + extends: .build_by_travis_for_centos8 + variables: + TESTING_VERSION_BUILD: 1 + UPLOAD_SYMBOL_FILES: 1 + BUILD_TYPE: RelWithDebInfo + PACKAGE: 1 + PULP3_REPO_NAME: tsg-testing-x86_64.el8 + PULP3_DIST_NAME: tsg-testing-x86_64.el8 + artifacts: + name: "hasp_update-develop-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - /^develop-.*$/i + - /^release-.*$/i + +release_build_debug_centos8: + stage: build + variables: + UPLOAD_SYMBOL_FILES: 1 + BUILD_TYPE: Debug + PACKAGE: 1 + PULP3_REPO_NAME: tsg-stable-x86_64.el8 + PULP3_DIST_NAME: tsg-stable-x86_64.el8 + extends: .build_by_travis_for_centos8 + artifacts: + name: "hasp_update-install-$CI_COMMIT_REF_NAME-debug" + paths: + - build/*.rpm + only: + - tags + +release_build_release_centos8: + stage: build + variables: + BUILD_TYPE: RelWithDebInfo + UPLOAD_SYMBOL_FILES: 1 + PACKAGE: 1 + PULP3_REPO_NAME: tsg-stable-x86_64.el8 + PULP3_DIST_NAME: tsg-stable-x86_64.el8 + extends: .build_by_travis_for_centos8 + artifacts: + name: "hasp_update-install-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - tags \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bc7eae..e3a62dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,8 @@ elseif(ENABLE_SANITIZE_THREAD) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan") endif() +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lelf") + if(ENABLE_SANITIZE_ADDRESS AND ENABLE_SANITIZE_THREAD) message(WARNING "Both ENABLE_SANITIZE_ADDRESS and ENABLE_SANITIZE_THREAD set, only ENABLE_SANITIZE_ADDRESS effected.") endif() diff --git a/ci/travis.sh b/ci/travis.sh index 2070d01..3186bd8 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -33,7 +33,6 @@ env | sort : "${COMPILER_IS_GNUCXX:=OFF}" # Install dependency from YUM -yum install -y libasan if [ $ASAN_OPTION ];then source /opt/rh/devtoolset-7/enable @@ -58,6 +57,6 @@ fi if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then rpm -i hasp_update*debuginfo*.rpm - cp /usr/lib/debug/opt/tsg/hasp_update/bin/hasp_update.debug /tmp/hasp_update.debuginfo.${CI_COMMIT_SHORT_SHA} + cp /usr/lib/debug/opt/tsg/hasp_update/bin/hasp_update*debug /tmp/hasp_update.debuginfo.${CI_COMMIT_SHORT_SHA} sentry-cli upload-dif -t elf /tmp/hasp_update.debuginfo.${CI_COMMIT_SHORT_SHA} fi \ No newline at end of file