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 | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 925d1cc..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"
@@ -90,22 +90,22 @@
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/lcc-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: "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"
--
Gitblit v1.9.1