Skip to content

Commit

Permalink
Travis: install Gemfile dependencies during 'install' step
Browse files Browse the repository at this point in the history
This ensures that a failure to do so marks the build as 'errored'
instead of 'failed'. The former indicates a CI failure instead of the
latter which indicates a failure of the system under test.
  • Loading branch information
muggenhor committed Aug 27, 2017
1 parent a7ff906 commit 8eb8187
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ addons:

install:
- if [[ "${TRAVIS_OS_NAME}" = "osx" ]]; then brew update && brew install ninja qt5; fi
- gem install bundler
- bundle install
# TODO: Revert to the following line when https://github.com/okkez/coveralls-lcov/pull/9 is merged and released.
#- if [ -n "${COVERALLS_SERVICE_NAME}" ]; then gem install coveralls-lcov; fi
- if [ -n "${COVERALLS_SERVICE_NAME}" ]; then gem install specific_install && gem specific_install -l https://github.com/muggenhor/coveralls-lcov.git -b branch-coverage; fi
Expand Down
1 change: 1 addition & 0 deletions src/Regex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ FindRegexMatch::FindRegexMatch(const boost::regex &regexImpl, const std::string
if (regexMatched) {
boost::smatch::const_iterator i = matchResults.begin();
if (i != matchResults.end())
// Skip capture group 0 which is the whole match, not a user marked sub-expression
++i;
for (; i != matchResults.end(); ++i) {
if (i->matched) {
Expand Down
3 changes: 0 additions & 3 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
set -e #break script on non-zero exitcode from any command
set -x #display command being executed

gem install bundler
bundle install

CTEST_OUTPUT_ON_FAILURE=ON
export CTEST_OUTPUT_ON_FAILURE

Expand Down

0 comments on commit 8eb8187

Please sign in to comment.