From e14bc49d1606be7e01596f408df0e2c956a4f46d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 03 5月 2020 19:57:57 +0800
Subject: [PATCH] update license generator
---
.travis.yml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6b0a65f..c2099b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@
name: "Ubuntu 18.04 - Travis CI VM"
env:
- VIRTUAL_ENV=VM
+ - CTEST_OUTPUT_ON_FAILURE=1
addons:
apt:
packages:
@@ -30,7 +31,7 @@
- libboost-date-time-dev
script:
- cmake --build . --target install
- - ctest
+ - src/inspector/lccinspector
- ctest -T memcheck
- os: linux
dist: xenial
@@ -55,6 +56,7 @@
name: "Ubuntu 18.04 - Travis CI VM - Debug build"
env:
- VIRTUAL_ENV=VM
+ - CTEST_OUTPUT_ON_FAILURE=1
addons:
apt:
packages:
@@ -75,6 +77,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 +99,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 && VIRTUAL_ENV=CONTAINER make test"
- os: linux
dist: bionic
name: "CentOS-8 Docker"
@@ -112,7 +115,7 @@
- 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 && VIRTUAL_ENV=DOCKER make test"
- os: linux
dist: bionic
name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
@@ -134,8 +137,8 @@
- p7zip-full
before_script:
- cd build
- - wget -c https://github.com/boostorg/boost/archive/boost-1.71.0.tar.gz
- - tar xzf boost_1_71_0.tar.gz
+ - 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 boost_1_71_0
- ./bootstrap.sh
@@ -177,10 +180,10 @@
echo "Boost already installed"
else
echo "Boost not cached, compiling it"
- wget -q https://github.com/boostorg/boost/archive/boost-1.68.0.tar.gz
+ wget -q https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.7z
echo "Boost downloaded"
- travis_wait 20 tar -xzf boost-1.68.0.tar.gz
- cd "boost_1_68_0"
+ travis_wait 20 7z x boost_1_68_0.7z -oC:/local
+ cd "C:/local/boost_1_68_0"
./bootstrap.bat gcc
travis_wait 40 ./b2.exe -d0 --with-date_time --with-test --with-filesystem --with-program_options --with-regex --with-serialization --with-system runtime-link=static toolset=gcc --prefix=${TRAVIS_BUILD_DIR}/boost-mingw install
echo "Boost installed"
--
Gitblit v1.9.1