From b26403798d0b549e69707bce80559028f4f52def Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 19 Jul 2017 20:45:06 -0400 Subject: [PATCH 1/4] Moving to Trusty for builds --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1e7fc855..cd1905ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: cpp sudo: false +dist: trusty branches: exclude: - gh-pages From d6c40f12b76c0a6f638b0ad1a743b54b263e6046 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 19 Jul 2017 21:13:33 -0400 Subject: [PATCH 2/4] Fix for GCC 4.7 and the timer --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cd1905ff..4bc76b85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ matrix: - g++-4.7 env: - COMPILER=4.7 + - CXXFLAGS=-D_GLIBCXX_USE_NANOSLEEP - os: osx install: - python -c 'import sys; print(sys.version_info[:])' From 8bf8a695de2779f0f2a651892c1d934f384d377d Mon Sep 17 00:00:00 2001 From: Henry Fredrick Schreiner Date: Tue, 22 Aug 2017 12:07:15 -0700 Subject: [PATCH 3/4] Avoid examples in coverage --- .ci/run_codecov.sh | 2 +- CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/run_codecov.sh b/.ci/run_codecov.sh index 25f8f870..8cbaae7d 100755 --- a/.ci/run_codecov.sh +++ b/.ci/run_codecov.sh @@ -7,7 +7,7 @@ cmake --build . -- -j2 cmake --build . --target CLI_coverage lcov --directory . --capture --output-file coverage.info # capture coverage info -lcov --remove coverage.info '*/tests/*' '*gtest*' '*gmock*' '/usr/*' --output-file coverage.info # filter out system +lcov --remove coverage.info '*/tests/*' '*/examples/*' '*gtest*' '*gmock*' '/usr/*' --output-file coverage.info # filter out system lcov --list coverage.info #debug info # Uploading report to CodeCov bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" diff --git a/CHANGELOG.md b/CHANGELOG.md index eb660515..7f81c33e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ * Added simple support for enumerations, allow non-printable objects [#12](https://github.com/CLIUtils/CLI11/issues/12) * Added `app.parse_order()` with original parse order ([#13](https://github.com/CLIUtils/CLI11/issues/13), [#16](https://github.com/CLIUtils/CLI11/pull/16)) * Added `prefix_command()`, which is like `allow_extras` but instantly stops and returns. ([#8](https://github.com/CLIUtils/CLI11/issues/8), [#17](https://github.com/CLIUtils/CLI11/pull/17)) -* Removed Windows error ([#10](https://github.com/CLIUtils/CLI11/issues/10), [#20](https://github.com/CLIUtils/CLI11/pull/20)) +* Removed Windows warning ([#10](https://github.com/CLIUtils/CLI11/issues/10), [#20](https://github.com/CLIUtils/CLI11/pull/20)) * Some improvements to CMake, detect Python and no dependencies on Python 2 (like Python 3) ([#18](https://github.com/CLIUtils/CLI11/issues/18), [#21](https://github.com/CLIUtils/CLI11/pull/21)) ## Version 1.0 From 34e14b74456b02bbbceaee9e5267f36fab3c15e0 Mon Sep 17 00:00:00 2001 From: Henry Fredrick Schreiner Date: Tue, 22 Aug 2017 14:02:53 -0700 Subject: [PATCH 4/4] Removing example directory from code coverage --- .ci/run_codecov.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/run_codecov.sh b/.ci/run_codecov.sh index 8cbaae7d..2272459d 100755 --- a/.ci/run_codecov.sh +++ b/.ci/run_codecov.sh @@ -2,7 +2,7 @@ set -evx cd ${TRAVIS_BUILD_DIR} cd build -cmake .. -DCLI_SINGLE_FILE_TESTS=OFF -DCMAKE_BUILD_TYPE=Coverage +cmake .. -DCLI_SINGLE_FILE_TESTS=OFF -DCLI_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Coverage cmake --build . -- -j2 cmake --build . --target CLI_coverage