diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58c0bcc..ac27c74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ -image: "git.mesalab.cn:7443/mesa_platform/build-env:master" variables: GIT_STRATEGY: "clone" + BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master" + BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux" BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ INSTALL_PREFIX: "/opt/MESA/" INSTALL_DEPENDENCY_LIBRARY: framework_env libMESA_jump_layer @@ -8,7 +9,7 @@ variables: stages: - build -.build_by_travis: +.build_by_travis_for_centos7: before_script: - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/ - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH @@ -21,9 +22,23 @@ stages: tags: - share -branch_build_debug: +.build_by_travis_for_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 + script: + - yum makecache fast + - ./ci/travis.sh + - cd build + tags: + - share + +branch_build_debug_for_centos7: stage: build - extends: .build_by_travis + image: $BUILD_IMAGE_CENTOS7 + extends: .build_by_travis_for_centos7 variables: BUILD_TYPE: Debug except: @@ -32,20 +47,22 @@ branch_build_debug: - /^master.*$/i - tags -branch_build_release: +branch_build_release_for_centos7: stage: build + image: $BUILD_IMAGE_CENTOS7 variables: BUILD_TYPE: RelWithDebInfo - extends: .build_by_travis + extends: .build_by_travis_for_centos7 except: - /^dev*.*$/i - /^rel*.*$/i - /^master.*$/i - tags -develop_build_debug: +develop_build_debug_for_centos7: stage: build - extends: .build_by_travis + image: $BUILD_IMAGE_CENTOS7 + extends: .build_by_travis_for_centos7 variables: BUILD_TYPE: Debug PACKAGE: 1 @@ -64,9 +81,10 @@ develop_build_debug: - /^rel*.*$/i - /^master.*$/i -develop_build_release: +develop_build_release_for_centos7: stage: build - extends: .build_by_travis + image: $BUILD_IMAGE_CENTOS7 + extends: .build_by_travis_for_centos7 variables: BUILD_TYPE: RelWithDebInfo PACKAGE: 1 @@ -86,15 +104,16 @@ develop_build_release: - /^master.*$/i -release_build_release: +release_build_release_for_centos7: stage: build + image: $BUILD_IMAGE_CENTOS7 variables: BUILD_TYPE: RelWithDebInfo PACKAGE: 1 UPLOAD: 1 PULP3_REPO_NAME: platform-stable-x86_64.el7 PULP3_DIST_NAME: platform-stable-x86_64.el7 - extends: .build_by_travis + extends: .build_by_travis_for_centos7 artifacts: name: "tcpdump_mesa-$CI_COMMIT_REF_NAME-release" paths: @@ -102,8 +121,9 @@ release_build_release: only: - tags -release_build_release_devel: +release_build_release_devel_for_centos7: stage: build + image: $BUILD_IMAGE_CENTOS7 variables: BUILD_TYPE: RelWithDebInfo ENABLE_DEVEL_SWITCH: "ON" @@ -111,7 +131,112 @@ release_build_release_devel: UPLOAD: 1 PULP3_REPO_NAME: platform-stable-x86_64.el7 PULP3_DIST_NAME: platform-stable-x86_64.el7 - extends: .build_by_travis + extends: .build_by_travis_for_centos7 + artifacts: + name: "tcpdump_mesa-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - tags + + +branch_build_debug_for_centos8: + stage: build + image: $BUILD_IMAGE_CENTOS8 + 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 + image: $BUILD_IMAGE_CENTOS8 + 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 + image: $BUILD_IMAGE_CENTOS8 + extends: .build_by_travis_for_centos8 + variables: + BUILD_TYPE: Debug + PACKAGE: 1 + UPLOAD: 1 + TESTING_VERSION_BUILD: 1 + ENABLE_DEVEL_SWITCH: "ON" + ASAN_OPTION: ADDRESS + PULP3_REPO_NAME: platform-testing-x86_64.el8 + PULP3_DIST_NAME: platform-testing-x86_64.el8 + artifacts: + name: "tcpdump_mesa-$CI_COMMIT_REF_NAME-debug" + paths: + - build/*.rpm + only: + - /^dev*.*$/i + - /^rel*.*$/i + - /^master.*$/i + +develop_build_release_for_centos8: + stage: build + image: $BUILD_IMAGE_CENTOS8 + extends: .build_by_travis_for_centos8 + variables: + BUILD_TYPE: RelWithDebInfo + PACKAGE: 1 + UPLOAD: 1 + TESTING_VERSION_BUILD: 1 + ENABLE_DEVEL_SWITCH: "ON" + ASAN_OPTION: "OFF" + PULP3_REPO_NAME: platform-testing-x86_64.el8 + PULP3_DIST_NAME: platform-testing-x86_64.el8 + artifacts: + name: "tcpdump_mesa-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - /^dev*.*$/i + - /^rel*.*$/i + - /^master.*$/i + + +release_build_release_for_centos8: + stage: build + image: $BUILD_IMAGE_CENTOS8 + variables: + BUILD_TYPE: RelWithDebInfo + PACKAGE: 1 + UPLOAD: 1 + PULP3_REPO_NAME: platform-stable-x86_64.el8 + PULP3_DIST_NAME: platform-stable-x86_64.el8 + extends: .build_by_travis_for_centos8 + artifacts: + name: "tcpdump_mesa-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - tags + +release_build_release_devel_for_centos8: + stage: build + image: $BUILD_IMAGE_CENTOS8 + variables: + BUILD_TYPE: RelWithDebInfo + ENABLE_DEVEL_SWITCH: "ON" + PACKAGE: 1 + UPLOAD: 1 + PULP3_REPO_NAME: platform-stable-x86_64.el8 + PULP3_DIST_NAME: platform-stable-x86_64.el8 + extends: .build_by_travis_for_centos8 artifacts: name: "tcpdump_mesa-$CI_COMMIT_REF_NAME-release" paths: diff --git a/ci/travis.sh b/ci/travis.sh index 4d5f0f0..58227bd 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -38,7 +38,7 @@ if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then source /etc/profile.d/framework.sh fi -if [ $ASAN_OPTION ];then +if [ $ASAN_OPTION ] && [ -f "/opt/rh/devtoolset-7/enable" ] ;then source /opt/rh/devtoolset-7/enable fi diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 33da0c5..b7da1cf 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -21,7 +21,7 @@ SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt) set(CPACK_GENERATOR "RPM") set(CPACK_RPM_PACKAGE_VENDOR "MESA") set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes") -set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on") +set(CPACK_RPM_PACKAGE_RELEASE_LIBRARIES "on") set(CPACK_RPM_DEBUGINFO_PACKAGE "on") set(CPACK_RPM_PACKAGE_DEBUG 1) @@ -32,23 +32,19 @@ set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") set(CPACK_COMPONENT_EXECUTABLE_REQUIRED TRUE) set(CPACK_RPM_EXECUTABLE_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) -set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_RPM_EXECUTABLE_DEBUGINFO_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_COMPONENT_EXECUTABLE_GROUP "executable") -set(CPACK_COMPONENT_LIBRARY_GROUP "executable") +set(CPACK_COMPONENT_LIBRARIES_GROUP "executable") set(CPACK_COMPONENT_PROFILE_GROUP "executable") set(CPACK_COMPONENT_HEADER_REQUIRED TRUE) set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel") -set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_COMPONENT_HEADER_GROUP "header") -set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME}) +set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME}) set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) -set(CPACK_COMPONENTS_ALL LIBRARY HEADER EXECUTABLE PROFILE) +set(CPACK_COMPONENTS_ALL LIBRARIES HEADER EXECUTABLE PROFILE) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") diff --git a/cmake/changelog.sh b/cmake/changelog.sh index 67f995f..a2fdc68 100644 --- a/cmake/changelog.sh +++ b/cmake/changelog.sh @@ -1,4 +1,4 @@ #!/bin/sh work_path=$1 branch=`git status | grep branch | awk '{print $NF}'` -git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B" | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/ -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt +git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %cd %an %ae %nhash: %H%ncommit:%n%B" | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/ -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt