diff --git a/.travis.yml b/.travis.yml index 0154fec4..7af9c187 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,7 @@ script: - | if [ -n "$CHECK_STYLE" ] then - .ci/check_style.sh + scripts/check_style.sh else .ci/travis.sh fi diff --git a/CHANGELOG.md b/CHANGELOG.md index cbb2c464..a85dc66c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ ## Version 1.3 (in progress) + +* Reworked the way defaults are set and inherited; explicit control given to user with `->option_defaults()` [#48](https://github.com/CLIUtils/CLI11/pull/48) * `parse` no longer returns (so `CLI11_PARSE` is always usable) [#37](https://github.com/CLIUtils/CLI11/pull/37) * Added `remaining()` and `remaining_size()` [#37](https://github.com/CLIUtils/CLI11/pull/37) * `allow_extras` and `prefix_command` are now valid on subcommands [#37](https://github.com/CLIUtils/CLI11/pull/37) @@ -8,6 +10,7 @@ * Help flags are easier to customize [#43](https://github.com/CLIUtils/CLI11/pull/43) * Subcommand now support groups [#46](https://github.com/CLIUtils/CLI11/pull/46) * `CLI::RuntimeError` added, for easy exit with error codes [#45](https://github.com/CLIUtils/CLI11/pull/45) +* The clang-format script is now no longer "hidden" [#48](https://github.com/CLIUtils/CLI11/pull/48) ## Version 1.2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 41a4a054..f4a67842 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,5 +17,4 @@ In general, make sure the addition is well thought out and does not increase the * Once you make the PR, tests will run to make sure your code works on all supported platforms * The test coverage is also measured, and that should remain 100% -* Formatting should be done with clang-format, otherwise the format check will not pass. However, it is trivial to apply this to your PR, so don't worry about this check - +* Formatting should be done with clang-format, otherwise the format check will not pass. However, it is trivial to apply this to your PR, so don't worry about this check. If you do have clang-format, just run `scripts/check_style.sh` diff --git a/.ci/check_style.sh b/scripts/check_style.sh similarity index 100% rename from .ci/check_style.sh rename to scripts/check_style.sh