From f7f0ba4206bfc30d4f9727a0e2448ee43cba6aad Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周二, 17 11月 2020 10:19:54 +0800
Subject: [PATCH] fix mingw
---
.travis.yml | 87 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 13 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 88a7b73..370681f 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,11 +31,68 @@
- libboost-date-time-dev
script:
- cmake --build . --target install
- - src/inspector/lccinspector
- - ctest
- - ctest -T memcheck
+ - ctest -T memcheck
+ - os: linux
+ dist: focal
+ name: "Ubuntu 20.04 - Travis CI VM - Debug"
+ 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:
+ - 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"
addons:
apt:
@@ -56,6 +114,7 @@
name: "Ubuntu 18.04 - Travis CI VM - Debug build"
env:
- VIRTUAL_ENV=VM
+ - CTEST_OUTPUT_ON_FAILURE=1
addons:
apt:
packages:
@@ -98,7 +157,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 && VIRTUAL_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"
@@ -114,13 +173,13 @@
- 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 && src/inspector/lccinspector && 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"
env:
- - CTEST_OUTPUT_ON_FAILURE=1
- - WINEARCH=win64
+ - CTEST_OUTPUT_ON_FAILURE=1
+ - WINEARCH=win64
addons:
apt:
packages:
@@ -148,6 +207,8 @@
- 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)"
+ env:
+ - CTEST_OUTPUT_ON_FAILURE=1
cache:
edge: true
directories:
@@ -179,7 +240,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"
@@ -217,7 +278,7 @@
- doxygen
- graphviz
before_script:
- - pip3 install setuptools sphinx sphinx_rtd_theme breathe sphinx-markdown-tables recommonmark sphinx-rtd-theme sphinx-sitemap sphinxemoji
+ - pip3 install setuptools sphinx sphinx_rtd_theme breathe sphinx-markdown-tables recommonmark sphinx-sitemap sphinxemoji
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
script:
- make documentation
@@ -232,11 +293,11 @@
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