From 352744a709aec2cb55a3e1706afa16eec726ea87 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 25 4月 2020 21:47:02 +0800
Subject: [PATCH] try run inspector before tests
---
.travis.yml | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 7ba28fb..aa174d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@
- libboost-date-time-dev
script:
- cmake --build . --target install
+ - src/inspector/lccinspector
- ctest
- ctest -T memcheck
- os: linux
@@ -75,6 +76,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
@@ -112,7 +114,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"
@@ -146,6 +148,10 @@
- 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/ ..
- 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
- cd "${TRAVIS_BUILD_DIR}/build"
@@ -153,22 +159,23 @@
- 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 ..
-
- os: windows
name: "Widnows server 1803 - MinGW Win64"
- env:
- - CACHE_NAME=boost-mingw
cache:
- name: boost-mingw
+ edge: true
directories:
- - "/C/local/boost"
+ - "./boost-mingw"
before_script:
- |
- if [ -d "/C/local/boost/lib" ]; then
+ if [ -d "${TRAVIS_BUILD_DIR}/boost-mingw/lib" ]; then
echo "Boost already installed"
else
echo "Boost not cached, compiling it"
@@ -177,13 +184,13 @@
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=C:/local/boost install
+ 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"
- cd /C/local/boost/lib
+ cd ${TRAVIS_BUILD_DIR}/boost-mingw/lib
dir
fi
- cd "${TRAVIS_BUILD_DIR}"
- - cd build && cmake -G "MinGW Makefiles" -DBOOST_ROOT="C:/local/boost" -DBoost_ARCHITECTURE="-x64" -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID="x64" -DCMAKE_SH="CMAKE_SH-NOTFOUND" ..
+ - cd build && cmake -G "MinGW Makefiles" -DBOOST_ROOT="${TRAVIS_BUILD_DIR}/boost-mingw" -DBoost_ARCHITECTURE="-x64" -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID="x64" -DCMAKE_SH="CMAKE_SH-NOTFOUND" ..
script:
- travis_wait 20 cmake --build . --target install --config Release
- ctest -C Release
@@ -206,10 +213,11 @@
- libboost-thread-dev
- libboost-date-time-dev
- python3-pip
+ - python3-setuptools
- doxygen
- graphviz
before_script:
- - pip3 install sphinx sphinx_rtd_theme breathe sphinx-markdown-tables recommonmark sphinx-rtd-theme sphinx-sitemap
+ - 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
--
Gitblit v1.9.1