gfwleak/pxz-hos-client-cpp-module
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ feat(TSG-9687): 适配rocky linux 8.5

Browse Source
This commit is contained in:
“pengxuanzheng”
2022-03-04 08:00:37 +00:00
parent 7de1970f87
commit f9800bb7ee
2 changed files with 200 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

264
.gitlab-ci.yml
View File

@@ -1,18 +1,47 @@
image: "git.mesalab.cn:7443/mesa_platform/build-env:master"
variables: variables:
GIT_STRATEGY: "clone" GIT_STRATEGY: "clone"
BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
INSTALL_PREFIX: "/home/mesasoft/sapp_run/" INSTALL_PREFIX: "/home/mesasoft/sapp_run/"
INSTALL_DEPENDENCY_LIBRARY: framework_env libMESA_field_stat2-devel zlib-devel openssl-devel curl-devel libMESA_prof_load-devel libMESA_handle_logger-devel INSTALL_DEPENDENCY_LIBRARY: framework_env libMESA_field_stat2-devel zlib-devel openssl-devel curl-devel libMESA_prof_load-devel libMESA_handle_logger-devel
TESTING_VERSION_BUILD: 0 TESTING_VERSION_BUILD: 0
stages: stages:
- analysis - analysis
- test
- build - build
run_cppcheck: .build_before_script:
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 makecache
- ./ci/travis.sh
.build_by_travis_for_centos7:
stage: build
image: $BUILD_IMAGE_CENTOS7
extends: .build_before_script
script:
- ./ci/travis.sh
- cd build
tags:
- share
.build_by_travis_for_centos8:
stage: build
image: $BUILD_IMAGE_CENTOS8
extends: .build_before_script
script:
- ./ci/travis.sh
tags:
- share
run_cppcheck_for_centos7:
stage: analysis stage: analysis
image: $BUILD_IMAGE_CENTOS7
script: script:
- mkdir build || true - mkdir build || true
- cd build - cd build
@@ -21,34 +50,41 @@ run_cppcheck:
tags: tags:
- share - share
.build_by_travis: run_cppcheck_for_centos8:
before_script: stage: analysis
- mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/ image: $BUILD_IMAGE_CENTOS8
- ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
- cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
- chmod +x ./ci/travis.sh
script: script:
- yum makecache fast - mkdir build || true
- ./ci/travis.sh - cd build
- cd build - cmake3 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
- cppcheck --project=compile_commands.json --enable=all --error-exitcode=1 --suppress=unusedFunction --suppress=missingInclude --suppress=uselessAssignmentPtrArg --suppress=unmatchedSuppression
tags: tags:
- share - share
# run_test: # run_test_for_centos7:
# stage: test # stage: test
# extends: .build_by_travis # image: $BUILD_IMAGE_CENTOS7
# variables: # extends: .build_by_travis_for_centos7
# HOS_MOCK: "ON"
# HOS_MESA_LOG: "OFF"
# script: # script:
# - yum makecache # - yum makecache
# - ./ci/travis.sh # - ./ci/travis.sh
# - cd build # - cd build
# - ctest --verbose # - ctest --verbose
branch_build_debug: # run_test_for_centos8:
# stage: test
# image: $BUILD_IMAGE_CENTOS8
# extends: .build_by_travis_for_centos8
# script:
# - yum makecache
# - yum install -y libnsl
# - ./ci/travis.sh
# - cd build
# - ctest3 --verbose
branch_build_debug_for_centos7:
stage: build stage: build
extends: .build_by_travis extends: .build_by_travis_for_centos7
variables: variables:
BUILD_TYPE: Debug BUILD_TYPE: Debug
except: except:
@@ -56,83 +92,181 @@ branch_build_debug:
- /^master.*$/i - /^master.*$/i
- tags - tags
branch_build_release: branch_build_release_for_centos7:
stage: build stage: build
variables: variables:
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
extends: .build_by_travis extends: .build_by_travis_for_centos7
except: except:
- /^develop.*$/i - /^develop.*$/i
- /^master.*$/i - /^master.*$/i
- tags - tags
develop_build_debug: develop_build_debug_for_centos7:
stage: build stage: build
extends: .build_by_travis extends: .build_by_travis_for_centos7
variables: variables:
BUILD_TYPE: Debug BUILD_TYPE: Debug
TESTING_VERSION_BUILD: 1
PACKAGE: 1 PACKAGE: 1
UPLOAD: 1 UPLOAD_RPM: 1
PULP3_REPO_NAME: tsg-testing-x86_64.el7 ASAN_OPTION: ADDRESS
PULP3_DIST_NAME: tsg-testing-x86_64.el7 TESTING_VERSION_BUILF: 1
PULP3_REPO_NAME: framework-testing-x86_64.el7
PILP3_DIST_NAME: framework-testing-x86_64.el7
artifacts: artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-debug" name: "hos-client-cpp-$CI_COMMIT_REF_NAME-debug"
paths: paths:
- build/*.rpm - build/*.rpm
only: only:
- /^develop.*$/i - /^dev*.*$/i
- /^master.*$/i - /^rel*.*$/i
- /^master.$/i
develop_build_release: develop_build_release_for_centos7:
stage: build stage: build
extends: .build_by_travis extends: .build_by_travis_for_centos7
variables: variables:
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
TESTING_VERSION_BUILD: 1
PACKAGE: 1 PACKAGE: 1
UPLOAD: 1 UPLOAD_RPM: 1
ASAN_OPTION: "OFF" TESTING_VERSION_BUILF: 1
PULP3_REPO_NAME: tsg-testing-x86_64.el7 PULP3_REPO_NAME: framework-testing-x86_64.el7
PULP3_DIST_NAME: tsg-testing-x86_64.el7 PILP3_DIST_NAME: framework-testing-x86_64.el7
artifacts: artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release" name: "hos-client-cpp-$CI_COMMIT_REF_NAME-debug"
paths: paths:
- build/*.rpm - build/*.rpm
only: only:
- /^develop.*$/i - /^dev*.*$/i
- /^master.*$/i - /^rel*.*$/i
- /^master.$/i
release_build_debug_for_centos7:
release_build_release:
stage: build stage: build
variables: variables:
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: Debug
PACKAGE: 1 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
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
- tags
release_build_release_devel:
stage: build
variables:
BUILD_TYPE: RelWithDebInfo
ENABLE_DEVEL_SWITCH: "ON"
PACKAGE: 1
UPLOAD: 1
UPLOAD_SYMBOL_FILES: 1 UPLOAD_SYMBOL_FILES: 1
SYMBOL_TARGET: hos-client-cpp SYMBOL_TARGET: hos-client-cpp
PULP3_REPO_NAME: framework-stable-x86_64.el7 PULP3_REPO_NAME: framework-stable-x86_64.el7
PULP3_DIST_NAME: framework-stable-x86_64.el7 PULP3_DIST_NAME: framework-stable-x86_64.el7
extends: .build_by_travis extends: .build_by_travis_for_centos7
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
- tags
release_build_release_for_centos7:
stage: build
variables:
BUILD_TYPE: RelWithDebInfo
PACKAGE: 1
UPLOAD_RPM: 1
UPLOAD_SYMBOL_FILES: 1
SYMBOL_TARGET: hos-client-cpp
PULP3_REPO_NAME: framework-stable-x86_64.el7
PULP3_DIST_NAME: framework-stable-x86_64.el7
extends: .build_by_travis_for_centos7
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
- tags
branch_build_debug_for_centos8:
stage: build
extends: .build_by_travis_for_centos8
variables:
BUILD_TYPE: Debug
except:
- /^dev*.*$/i
- /^rel*.*$/i
- /^master.*$/i
- tags
branch_build_release_for_centos8:
stage: build
variables:
BUILD_TYPE: RelWithDebInfo
extends: .build_by_travis_for_centos8
except:
- /^dev*.*$/i
- /^rel*.*$/i
- /^master.*$/i
- tags
develop_build_debug_for_centos8:
stage: build
extends: .build_by_travis_for_centos8
variables:
BUILD_TYPE: Debug
PACKAGE: 1
UPLOAD_RPM: 1
ASAN_OPTION: ADDRESS
TESTING_VERSION_BUILF: 1
PULP3_REPO_NAME: framework-testing-x86_64.el8
PILP3_DIST_NAME: framework-testing-x86_64.el8
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-debug"
paths:
- build/*.rpm
only:
- /^dev*.*$/i
- /^rel*.*$/i
- /^master*.*$/i
develop_build_release_for_centos8:
stage: build
extends: .build_by_travis_for_centos8
variables:
BUILD_TYPE: RelWithDebInfo
PACKAGE: 1
UPLOAD_RPM: 1
TESTING_VERSION_BUILF: 1
PULP3_REPO_NAME: framework-testing-x86_64.el8
PILP3_DIST_NAME: framework-testing-x86_64.el8
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
- /^dev*.*$/i
- /^rel*.*$/i
- /^master*.*$/i
release_build_debug_for_centos8:
stage: build
variables:
BUILD_TYPE: Debug
PACKAGE: 1
UPLOAD_RPM: 1
UPLOAD_SYMBOL_FILES: 1
SYMBOL_TARGET: hos-client-cpp
PULP3_REPO_NAME: framework-stable-x86_64.el8
PULP3_DIST_NAME: framework-stable-x86_64.el8
extends: .build_by_travis_for_centos8
artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
- tags
release_build_release_for_centos8:
stage: build
variables:
BUILD_TYPE: RelWithDebInfo
PACKAGE: 1
UPLOAD_RPM: 1
UPLOAD_SYMBOL_FILES: 1
SYMBOL_TARGET: hos-client-cpp
PULP3_REPO_NAME: framework-stable-x86_64.el8
PULP3_DIST_NAME: framework-stable-x86_64.el8
extends: .build_by_travis_for_centos8
artifacts: artifacts:
name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release" name: "hos-client-cpp-$CI_COMMIT_REF_NAME-release"
paths: paths:

2
support/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ include(ExternalProject)
set(AWSS3_ROOT ${CMAKE_CURRENT_BINARY_DIR}) set(AWSS3_ROOT ${CMAKE_CURRENT_BINARY_DIR})
set(AWSS3_URL ${CMAKE_CURRENT_SOURCE_DIR}/aws-sdk-cpp-master.zip) set(AWSS3_URL ${CMAKE_CURRENT_SOURCE_DIR}/aws-sdk-cpp-master.zip)
set(AWSS3_URL_MD5 fe191c53c566e3ec58c69d016e0a18f7) set(AWSS3_URL_MD5 fe191c53c566e3ec58c69d016e0a18f7)
set(AWSS3_CONFIGURE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && cmake . -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF) set(AWSS3_CONFIGURE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && cmake3 . -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF)
set(AWSS3_MAKE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make) set(AWSS3_MAKE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make)
set(AWSS3_INSTALL cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make install PREFIX=${SUPPORT_INSTALL_PREFIX}) set(AWSS3_INSTALL cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make install PREFIX=${SUPPORT_INSTALL_PREFIX})