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 | 70 ++++++++++++++--------------------
1 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 737ff62..755d502 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@
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
@@ -34,7 +34,25 @@
- ctest -T memcheck
- os: linux
dist: focal
- name: "Ubuntu 20.04 - Travis CI VM - Debug"
+ 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
@@ -56,44 +74,13 @@
before_script:
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON -DLCC_PROJECT_NAME=MYPROJECT ..
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 -T memcheck; cat /tmp/open-license.log
- - os: linux
- dist: bionic
- name: "Ubuntu 18.04 - 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
env:
- CTEST_OUTPUT_ON_FAILURE=1
- name: "Ubuntu 16.04 - Travis CI VM"
+ name: "Travis CI VM"
addons:
apt:
packages:
@@ -111,7 +98,7 @@
- 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
@@ -175,13 +162,14 @@
- 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 && 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
addons:
apt:
+ update: true
packages:
- cmake
- binutils-mingw-w64
@@ -194,17 +182,17 @@
- wine64
- p7zip-full
before_script:
+ - 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
- - sudo ln -s /usr/bin/x86_64-w64-mingw32-g++ /usr/local/bin/g++-mingw
- 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)"
before_script:
--
Gitblit v1.9.1