From 8553a8d63f97cfa8d64b5b2260e81f8c896a8398 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周五, 23 5月 2025 18:36:03 +0800
Subject: [PATCH] 修改部分因为标准原因的报错
---
.travis.yml | 150 +++++++++++++++++++++++++------------------------
1 files changed, 77 insertions(+), 73 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ef5ebe0..755d502 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,10 @@
include:
- os: linux
dist: bionic
- name: "Ubuntu 18.04 - Travis CI VM"
+ name: "Travis CI VM"
env:
- VIRTUAL_ENV=VM
+ - CTEST_OUTPUT_ON_FAILURE=1
addons:
apt:
packages:
@@ -30,11 +31,56 @@
- libboost-date-time-dev
script:
- cmake --build . --target install
- - ctest
- - ctest -T memcheck
+ - ctest -T memcheck
+ - os: linux
+ dist: focal
+ name: "Travis CI VM - Release"
+ env:
+ - VIRTUAL_ENV=VM
+ - CTEST_OUTPUT_ON_FAILURE=1
+ before_script:
+ - sudo apt-get update
+ - sudo apt-get install -y cmake libssl-dev zlib1g-dev libboost-dev libboost-filesystem-dev libboost-test-dev libboost-iostreams-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev
+ - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Release ..
+ script:
+ - cat /proc/mounts
+ - ls -lLai /dev/disk/by-uuid
+ - ls -lLai /dev/disk/by-label
+ - ls -lai /dev
+ - ls -la /run
+ - cmake --build . --target install
+ - ctest; cat /tmp/open-license.log
+ - os: linux
+ dist: bionic
+ name: "VM - set LCC_PROJECT_NAME"
+ env:
+ - VIRTUAL_ENV=VM
+ - CTEST_OUTPUT_ON_FAILURE=1
+ addons:
+ apt:
+ packages:
+ - cmake
+ - valgrind
+ - libssl-dev
+ - zlib1g-dev
+ - libboost-dev
+ - libboost-test-dev
+ - libboost-filesystem-dev
+ - libboost-iostreams-dev
+ - libboost-program-options-dev
+ - libboost-system-dev
+ - libboost-thread-dev
+ - libboost-date-time-dev
+ before_script:
+ - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON -DLCC_PROJECT_NAME=MYPROJECT ..
+ script:
+ - cmake --build . --target install
+ - ctest -T memcheck
- os: linux
dist: xenial
- name: "Ubuntu 16.04 - Travis CI VM"
+ env:
+ - CTEST_OUTPUT_ON_FAILURE=1
+ name: "Travis CI VM"
addons:
apt:
packages:
@@ -52,9 +98,10 @@
- libboost-date-time-dev
- os: linux
dist: bionic
- name: "Ubuntu 18.04 - Travis CI VM - Debug build"
+ name: "Travis CI VM - Debug build"
env:
- VIRTUAL_ENV=VM
+ - CTEST_OUTPUT_ON_FAILURE=1
addons:
apt:
packages:
@@ -75,6 +122,7 @@
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON ..
script:
- cmake --build . --target install
+ - src/inspector/lccinspector
- ctest
after_success:
# Create lcov report
@@ -96,7 +144,7 @@
- docker commit centos7_toconfigure centos7_configured
script:
- docker run --name centos7_make -v `pwd`:/root/open-license-manager centos7_configured /bin/bash -c
- "cd /root/open-license-manager/build && make && make install && VIRT_ENV=CONTAINER make test"
+ "cd /root/open-license-manager/build && make && make install && CTEST_OUTPUT_ON_FAILURE=1 VIRTUAL_ENV=CONTAINER make test"
- os: linux
dist: bionic
name: "CentOS-8 Docker"
@@ -104,7 +152,7 @@
- docker run --name centos8_toconfigure -v `pwd`:/root/open-license-manager centos:centos8 /bin/bash -c \
"yum -y update && yum -y groupinstall 'Development Tools' &&
yum -y install wget cmake boost boost-devel openssl-devel zlib-devel &&
- dnf -y --enablerepo=PowerTools install boost-static &&
+ dnf -y --enablerepo=powertools install boost-static &&
wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz &&
tar xzf OpenSSL_1_1_1d.tar.gz && cd openssl-OpenSSL_1_1_1d &&
./config && make -j 8 && make install &&
@@ -112,15 +160,16 @@
- docker commit centos8_toconfigure centos8_configured
script:
- docker run --name centos8_make -v `pwd`:/root/open-license-manager centos8_configured /bin/bash -c \
- "cd /root/open-license-manager/build && make && make install && VIRTUAL_ENV=DOCKER make test"
+ "cd /root/open-license-manager/build && make && make install && src/inspector/lccinspector && CTEST_OUTPUT_ON_FAILURE=1 VIRTUAL_ENV=DOCKER make test"
- os: linux
- dist: bionic
- name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
+ dist: focal
+ name: "MinGW cross-compile for Windows x64"
env:
- - CTEST_OUTPUT_ON_FAILURE=1
- - WINEARCH=win64
+ - CTEST_OUTPUT_ON_FAILURE=1
+ - WINEARCH=win64
addons:
apt:
+ update: true
packages:
- cmake
- binutils-mingw-w64
@@ -133,38 +182,29 @@
- wine64
- p7zip-full
before_script:
- - cd build
- - wget -c https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
- - tar xjf boost_1_71_0.tar.bz2
- sudo ln -s /usr/bin/x86_64-w64-mingw32-g++ /usr/local/bin/g++-mingw
+ - cd build
+ - wget -c https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2
+ - tar xjf boost_1_71_0.tar.bz2
- cd boost_1_71_0
- ./bootstrap.sh
- travis_wait 30 ./b2 toolset=gcc-mingw target-os=windows address-model=64 --with-date_time --with-test --with-filesystem --with-program_options --with-regex --with-serialization --with-system runtime-link=static --prefix=./dist release install
- cd ..
- - wget --no-check-certificate https://bintray.com/vszakats/generic/download_file?file_path=openssl-1.0.2h-win64-mingw.7z -O openssl.7z
- - 7z x openssl.7z
- - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-ubuntu-mingw64.cmake -DCMAKE_INSTALL_PREFIX=../../install -DBOOST_ROOT=$PWD/boost_1_71_0/dist -DOPENSSL_ROOT_DIR=$PWD/openssl-1.0.2h-win64-mingw/ ..
+ - wget --no-check-certificate https://github.com/open-license-manager/build-dependencies/raw/main/openssl/openssl-dev-1.0.2s-x86_64-win-mingw-w64.zip -O openssl.zip
+ - unzip openssl.zip
+ - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-ubuntu-mingw64.cmake -DCMAKE_INSTALL_PREFIX=../../install -DBOOST_ROOT=$PWD/boost_1_71_0/dist -DOPENSSL_ROOT_DIR=$PWD/openssl/ ..
- os: windows
name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MD)"
- cache:
- edge: true
- directories:
- - "/C/local/boost"
before_script:
- - travis_wait 40 ./scripts/windows_download_boost.bat
+ - choco install -y boost-msvc-14.1
- cd "${TRAVIS_BUILD_DIR}/build"
- - cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" ..
+ - cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost_1_74_0" ..
- os: windows
name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MT)"
- cache:
- edge: true
- directories:
- - "/C/local/boost"
before_script:
- - travis_wait 40 ./scripts/windows_download_boost.bat
- - cd "${TRAVIS_BUILD_DIR}"
- - cd build && cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" -DSTATIC_RUNTIME=1 ..
+ - choco install -y boost-msvc-14.1
+ - cd build && cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost_1_74_0" -DSTATIC_RUNTIME=1 ..
- os: windows
name: "Widnows server 1803 - MinGW Win64"
cache:
@@ -177,7 +217,7 @@
echo "Boost already installed"
else
echo "Boost not cached, compiling it"
- wget -q https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.7z
+ wget -q https://versaweb.dl.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.7z
echo "Boost downloaded"
travis_wait 20 7z x boost_1_68_0.7z -oC:/local
cd "C:/local/boost_1_68_0"
@@ -192,49 +232,13 @@
script:
- travis_wait 20 cmake --build . --target install --config Release
- ctest -C Release
- - os: linux
- dist: bionic
- stage: documentation
- name: "Deploy documentation"
- addons:
- apt:
- packages:
- - cmake
- - libssl-dev
- - zlib1g-dev
- - libboost-dev
- - libboost-test-dev
- - libboost-filesystem-dev
- - libboost-iostreams-dev
- - libboost-program-options-dev
- - libboost-system-dev
- - libboost-thread-dev
- - libboost-date-time-dev
- - python3-pip
- - python3-setuptools
- - doxygen
- - graphviz
- before_script:
- - pip3 install setuptools sphinx sphinx_rtd_theme breathe sphinx-markdown-tables recommonmark sphinx-rtd-theme sphinx-sitemap sphinxemoji
- - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
- script:
- - make documentation
- deploy:
- provider: pages
- skip_cleanup: true
- github_token: $GITHUB_TOKEN
- keep_history: false
- verbose: true
- target_branch: "gh-pages"
- local_dir: "build/docs/sphinx"
- on:
- branch: develop
+
env:
- - CTEST_OUTPUT_ON_FAILURE=1
+ - CTEST_OUTPUT_ON_FAILURE=1
before_script:
- - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
+ - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
script:
- - cmake --build . --target install --config Release
- - ctest -C Release
+ - cmake --build . --target install --config Release
+ - ctest -C Release
\ No newline at end of file
--
Gitblit v1.9.1