From d02fce46e19f1a7b77a952210974a875c493593f Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 01 12月 2019 21:09:32 +0800
Subject: [PATCH] fix boost layout, update submodule
---
.travis.yml | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 773c9be..5e787b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,13 +61,21 @@
- libboost-system-dev
- libboost-thread-dev
- libboost-date-time-dev
+ - lcov
before_script:
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug ..
script:
- cmake --build . --target install
- ctest
- ctest -T memcheck
-
+ after_success:
+ # Create lcov report
+ - lcov --capture --directory . --output-file coverage.info
+ - lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files
+ - lcov --list coverage.info # debug info
+ # Uploading report to CodeCov
+ - bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
+
- os: linux
dist: bionic
name: "CentOS-7 Docker"
@@ -84,6 +92,9 @@
- os: linux
dist: bionic
name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
+ env:
+ - CTEST_OUTPUT_ON_FAILURE=1
+ - WINEARCH=win64
addons:
apt:
packages:
@@ -92,8 +103,11 @@
- mingw-w64
- mingw-w64-tools
- mingw-w64-x86-64-dev
+ - wine64-development
+ - wine64-development-preloader
- wine-development
- - wine32-development
+ - 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
@@ -103,18 +117,20 @@
- ./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 ..
- - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-ubuntu-mingw64.cmake -DCMAKE_INSTALL_PREFIX=../../install -DBOOST_ROOT=$PWD/boost_1_71_0/dist ..
+ - 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/ ..
- os: windows
name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MD)"
before_script:
- - travis_wait 40 ./windows_download_boost.bat
+ - travis_wait 40 ./scripts/windows_download_boost.bat
- cd "${TRAVIS_BUILD_DIR}/build"
- cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" ..
- os: windows
name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MT)"
before_script:
- - travis_wait 40 ./windows_download_boost.bat
+ - 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 ..
@@ -143,15 +159,17 @@
dir
fi
- cd "${TRAVIS_BUILD_DIR}"
- - cd build && cmake -G "MinGW Makefiles" --trace-expand -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="C:/local/boost" -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
+
env:
- CTEST_OUTPUT_ON_FAILURE=1
-
before_script:
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
script:
- cmake --build . --target install --config Release
- ctest -C Release
-
+
\ No newline at end of file
--
Gitblit v1.9.1