diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index d683b13ef3..240de516e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -170,6 +170,9 @@ after_success: - | if [[ "${COVERAGE}" = "yes" ]]; then (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash)) + # Also do this for nested executions, codecov will merge the results. + mv "${SRCDIR}"/testdir/nested/* "${SRCDIR}"/objects + (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash)) fi # vim:set sts=2 sw=2 tw=0 et: diff --git a/src/version.c b/src/version.c index 88180a127f..94f13393e7 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1163, +/**/ 1162, /**/ 1161, |