diff options
19 files changed, 66 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index edf40b6..2f0cd58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,11 +2,14 @@ variables: GIT_STRATEGY: "clone" BUILD_BASED_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master" BUILD_BASED_IMAGE_ROCKYLINUX8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux" + BUILD_BASED_IMAGE_ROCKYLINUX9_AARCH64: "git.mesalab.cn:7443/mesa_platform/build-env:rocky9-aarch64" + stages: - prebuild - build-centos7 - build-rockylinux8 +- build-rockylinux9-aarch .build_rpm: variables: @@ -23,6 +26,21 @@ stages: tags: - share +.build_aarch_rpm: + variables: + BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ + TESTING_VERSION_BUILD: 0 + 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 + - ./ci/travis.sh + tags: + - tsg-os-builder-aarch64 + feature_branch_build_rockylinux8: image: $BUILD_BASED_IMAGE_ROCKYLINUX8 stage: build-rockylinux8 @@ -64,4 +82,48 @@ release_build_rockylinux8: PULP3_RPM_DIST_NAME: tsg-stable-x86_64.el8 extends: .build_rpm only: + - tags + +# build aarch arch rpm +feature_branch_build_rockylinux9_aarch: + image: $BUILD_BASED_IMAGE_ROCKYLINUX9_AARCH64 + stage: build-rockylinux9-aarch + variables: + PACKAGE: 1 + LIBYAML_BUILD: 1 + TESTING_VERSION_BUILD: 1 + extends: .build_aarch_rpm + except: + - tags + - /^dev-.*$/i + - /^rel-.*$/i + - /^master.*$/i + +develop_build_rockylinux9_aarch: + image: $BUILD_BASED_IMAGE_ROCKYLINUX9_AARCH64 + stage: build-rockylinux9-aarch + variables: + PACKAGE: 1 + UPLOAD: 1 + LIBYAML_BUILD: 1 + TESTING_VERSION_BUILD: 1 + PULP3_RPM_REPO_NAME: tsg-testing-aarch64.el9 + PULP3_RPM_DIST_NAME: tsg-testing-aarch64.el9 + extends: .build_aarch_rpm + only: + - /^dev-.*$/i + - /^rel-.*$/i + - /^master.*$/i + +release_build_rockylinux9_aarch: + image: $BUILD_BASED_IMAGE_ROCKYLINUX9_AARCH64 + stage: build-rockylinux9-aarch + variables: + PACKAGE: 1 + UPLOAD: 1 + LIBYAML_BUILD: 1 + PULP3_RPM_REPO_NAME: tsg-stable-aarch64.el9 + PULP3_RPM_DIST_NAME: tsg-stable-aarch64.el9 + extends: .build_aarch_rpm + only: - tags
\ No newline at end of file diff --git a/breakpad-coredump-tools/src/client/linux/dump_writer_common/thread_info.o b/breakpad-coredump-tools/src/client/linux/dump_writer_common/thread_info.o Binary files differdeleted file mode 100644 index 2b5b3a2..0000000 --- a/breakpad-coredump-tools/src/client/linux/dump_writer_common/thread_info.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/client/linux/dump_writer_common/ucontext_reader.o b/breakpad-coredump-tools/src/client/linux/dump_writer_common/ucontext_reader.o Binary files differdeleted file mode 100644 index 9e3b2db..0000000 --- a/breakpad-coredump-tools/src/client/linux/dump_writer_common/ucontext_reader.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_core_dumper.o b/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_core_dumper.o Binary files differdeleted file mode 100644 index 622e28f..0000000 --- a/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_core_dumper.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_dumper.o b/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_dumper.o Binary files differdeleted file mode 100644 index c9b9f19..0000000 --- a/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_dumper.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_ptrace_dumper.o b/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_ptrace_dumper.o Binary files differdeleted file mode 100644 index 95bad2f..0000000 --- a/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_ptrace_dumper.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/client/linux/minidump_writer/minidump_writer.o b/breakpad-coredump-tools/src/client/linux/minidump_writer/minidump_writer.o Binary files differdeleted file mode 100644 index a751d00..0000000 --- a/breakpad-coredump-tools/src/client/linux/minidump_writer/minidump_writer.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/client/linux/minidump_writer/pe_file.o b/breakpad-coredump-tools/src/client/linux/minidump_writer/pe_file.o Binary files differdeleted file mode 100644 index 827c5e7..0000000 --- a/breakpad-coredump-tools/src/client/linux/minidump_writer/pe_file.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/client/minidump_file_writer.o b/breakpad-coredump-tools/src/client/minidump_file_writer.o Binary files differdeleted file mode 100644 index bbf2c34..0000000 --- a/breakpad-coredump-tools/src/client/minidump_file_writer.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/common/convert_UTF.o b/breakpad-coredump-tools/src/common/convert_UTF.o Binary files differdeleted file mode 100644 index d179978..0000000 --- a/breakpad-coredump-tools/src/common/convert_UTF.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/common/linux/elf_core_dump.o b/breakpad-coredump-tools/src/common/linux/elf_core_dump.o Binary files differdeleted file mode 100644 index 24ae7b7..0000000 --- a/breakpad-coredump-tools/src/common/linux/elf_core_dump.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/common/linux/elfutils.o b/breakpad-coredump-tools/src/common/linux/elfutils.o Binary files differdeleted file mode 100644 index 8bab125..0000000 --- a/breakpad-coredump-tools/src/common/linux/elfutils.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/common/linux/file_id.o b/breakpad-coredump-tools/src/common/linux/file_id.o Binary files differdeleted file mode 100644 index c6973db..0000000 --- a/breakpad-coredump-tools/src/common/linux/file_id.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/common/linux/linux_libc_support.o b/breakpad-coredump-tools/src/common/linux/linux_libc_support.o Binary files differdeleted file mode 100644 index 5464a06..0000000 --- a/breakpad-coredump-tools/src/common/linux/linux_libc_support.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/common/linux/memory_mapped_file.o b/breakpad-coredump-tools/src/common/linux/memory_mapped_file.o Binary files differdeleted file mode 100644 index 8997eb1..0000000 --- a/breakpad-coredump-tools/src/common/linux/memory_mapped_file.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/common/linux/safe_readlink.o b/breakpad-coredump-tools/src/common/linux/safe_readlink.o Binary files differdeleted file mode 100644 index adcddc1..0000000 --- a/breakpad-coredump-tools/src/common/linux/safe_readlink.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/common/path_helper.o b/breakpad-coredump-tools/src/common/path_helper.o Binary files differdeleted file mode 100644 index b7d8691..0000000 --- a/breakpad-coredump-tools/src/common/path_helper.o +++ /dev/null diff --git a/breakpad-coredump-tools/src/common/string_conversion.o b/breakpad-coredump-tools/src/common/string_conversion.o Binary files differdeleted file mode 100644 index 4b5a4db..0000000 --- a/breakpad-coredump-tools/src/common/string_conversion.o +++ /dev/null diff --git a/ci/travis.sh b/ci/travis.sh index ccfa7bf..34e9270 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -37,16 +37,15 @@ export VERSION_ID=$(./autorevision.sh -t sh -o version | grep VCS_TAG | sed 's/^ export COMMIT_ID=$(./autorevision.sh -t sh -o version | grep VCS_SHORT_HASH | sed 's/^.*v//g' | sed 's/"//g'| sed 's/VCS_SHORT_HASH=//') # export VERSION_ID="1.0.0" yum install -y golang +yum install -y zlib-devel go version export GOPROXY=https://proxy.golang.com.cn,direct -go env -pwd -ls mkdir -p /builds/linxin/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} make -C /builds/linxin/coredump-tools/breakpad-coredump-tools/src/tools/linux/coredump_handler_wrapper mkdir -p /opt/tsg/coredump/bin cp /builds/linxin/coredump-tools/breakpad-coredump-tools/src/tools/linux/coredump_handler_wrapper/coredump_handler_wrapper.so /opt/tsg/coredump/bin cp /builds/linxin/coredump-tools/breakpad-coredump-tools/src/tools/linux/coredump_handler_wrapper/coredump_handler_wrapper.so /builds/linxin/coredump-tools/coredump-handler +make clean -C /builds/linxin/coredump-tools/breakpad-coredump-tools make -C /builds/linxin/coredump-tools/breakpad-coredump-tools cp /builds/linxin/coredump-tools/breakpad-coredump-tools/src/tools/linux/md2core/minidump-2-core /builds/linxin/coredump-tools/coredump-tool/ mv /builds/linxin/coredump-tools /builds/linxin/coredump-tools-${VERSION_ID} @@ -54,9 +53,8 @@ tar --warning=no-file-changed -czvf /builds/linxin/rpmbuild/SOURCES/coredump-too cp /builds/linxin/coredump-tools-${VERSION_ID}/script/coredump.spec /builds/linxin/rpmbuild/SPECS cd /builds/linxin rpmbuild --define "_topdir `pwd`/rpmbuild" --define "_version ${VERSION_ID}" --define "_release ${COMMIT_ID}" --define "_commit ${COMMIT_ID}" -ba /builds/linxin/rpmbuild/SPECS/coredump.spec -cd /builds/linxin/rpmbuild/RPMS/x86_64 -ls -halt ./*.rpm - +ARCH=$(uname -m) +cd /builds/linxin/rpmbuild/RPMS/${ARCH} if [ -n "${UPLOAD}" ]; then cp ~/rpm_upload_tools.py ./ python3 rpm_upload_tools.py ${PULP3_RPM_REPO_NAME} ${PULP3_RPM_DIST_NAME} *.rpm |