From 7c2489cc3dc798484e11a449fd0e305210de901b Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 12月 2019 20:12:41 +0800
Subject: [PATCH] fix codacy warnings
---
.travis.yml | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 73c2fab..4cbd109 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,7 @@
- libboost-date-time-dev
- lcov
before_script:
- - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug ..
+ - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON ..
script:
- cmake --build . --target install
- ctest
@@ -71,7 +71,7 @@
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 --remove coverage.info '/usr/include/*' '*/ini/*' '*/test/*' --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"
@@ -82,13 +82,30 @@
before_script:
- docker run --name centos7_toconfigure -v `pwd`:/root/open-license-manager centos:centos7 /bin/bash -c
"yum -y update && yum -y install install centos-release-scl &&
- yum -y install cmake boost boost-devel boost-static openssl openssl-devel glibc-static devtoolset-7-toolchain devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-valgrind-devel &&
- cd /root/open-license-manager/build &&
- CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ cmake .."
+ yum -y install wget boost boost-devel boost-static openssl openssl-devel openssl-static glibc-static devtoolset-7-toolchain devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-valgrind-devel &&
+ wget https://cmake.org/files/v3.11/cmake-3.11.0.tar.gz && tar zxvf cmake-3.11.0.tar.gz && cd cmake-3.11.0 &&
+ export CC=/opt/rh/devtoolset-7/root/usr/bin/gcc && export CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ &&
+ ./bootstrap && make && make install && cd /root/open-license-manager/build && cmake .."
- 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"
+# - os: linux
+# dist: bionic
+# name: "CentOS-8 Docker"
+# before_script:
+# - docker run --name centos8_toconfigure -v `pwd`:/root/open-license-manager centos:centos8 /bin/bash -c \
+# "yum -y update && yum -y groupinstall 'Development Tools' &&
+# yum -y install wget cmake boost boost-devel openssl-devel zlib-devel &&
+# dnf -y --enablerepo=PowerTools install boost-static &&
+# wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz &&
+# tar xzf OpenSSL_1_1_1d.tar.gz && cd openssl-OpenSSL_1_1_1d &&
+# ./config && make -j 8 && make install &&
+# cd /root/open-license-manager/build && cmake .."
+# - 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 && VIRT_ENV=CONTAINER make test"
- os: linux
dist: bionic
name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
@@ -107,6 +124,7 @@
- wine64-development-preloader
- wine-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
@@ -116,10 +134,9 @@
- ./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 ..
- script:
- - cmake --build . --target install --config Release
- #disabling tests for now. Need to compile and install openssl...
+ - 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:
--
Gitblit v1.9.1