Peter M. Groen / CLI11

Commit e246fa3a4670eec6b6ad556e695bee128a5093d2

Authored by Henry Schreiner
Committed by GitHub
2 parents 363571be 34e14b74

Merge pull request #22 from CLIUtils/henryiii-patch-1 

Moving to Trusty for builds
Inline Side-by-side
Showing 3 changed files with 5 additions and 3 deletions
.ci/run_codecov.sh
  View file @e246fa3
... ... @@ -2,12 +2,12 @@ set -evx
2 2  
3 3 cd ${TRAVIS_BUILD_DIR}
4 4 cd build
5   -cmake .. -DCLI_SINGLE_FILE_TESTS=OFF -DCMAKE_BUILD_TYPE=Coverage
  5 +cmake .. -DCLI_SINGLE_FILE_TESTS=OFF -DCLI_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Coverage
6 6 cmake --build . -- -j2
7 7 cmake --build . --target CLI_coverage
8 8  
9 9 lcov --directory . --capture --output-file coverage.info # capture coverage info
10   -lcov --remove coverage.info '*/tests/*' '*gtest*' '*gmock*' '/usr/*' --output-file coverage.info # filter out system
  10 +lcov --remove coverage.info '*/tests/*' '*/examples/*' '*gtest*' '*gmock*' '/usr/*' --output-file coverage.info # filter out system
11 11 lcov --list coverage.info #debug info
12 12 # Uploading report to CodeCov
13 13 bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
... ...
.travis.yml
  View file @e246fa3
1 1 language: cpp
2 2 sudo: false
  3 +dist: trusty
3 4 branches:
4 5 exclude:
5 6 - gh-pages
... ... @@ -42,6 +43,7 @@ matrix:
42 43 - g++-4.7
43 44 env:
44 45 - COMPILER=4.7
  46 + - CXXFLAGS=-D_GLIBCXX_USE_NANOSLEEP
45 47 - os: osx
46 48 install:
47 49 - python -c 'import sys; print(sys.version_info[:])'
... ...
CHANGELOG.md
  View file @e246fa3
... ... @@ -3,7 +3,7 @@
3 3 * Added simple support for enumerations, allow non-printable objects [#12](https://github.com/CLIUtils/CLI11/issues/12)
4 4 * Added `app.parse_order()` with original parse order ([#13](https://github.com/CLIUtils/CLI11/issues/13), [#16](https://github.com/CLIUtils/CLI11/pull/16))
5 5 * 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))
6   -* Removed Windows error ([#10](https://github.com/CLIUtils/CLI11/issues/10), [#20](https://github.com/CLIUtils/CLI11/pull/20))
  6 +* Removed Windows warning ([#10](https://github.com/CLIUtils/CLI11/issues/10), [#20](https://github.com/CLIUtils/CLI11/pull/20))
7 7 * 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))
8 8  
9 9 ## Version 1.0
... ...