Skip to content

Commit 8eb8187

Browse files
committed
Travis: install Gemfile dependencies during 'install' step
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.
1 parent a7ff906 commit 8eb8187

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ addons:
4242

4343
install:
4444
- if [[ "${TRAVIS_OS_NAME}" = "osx" ]]; then brew update && brew install ninja qt5; fi
45+
- gem install bundler
46+
- bundle install
4547
# TODO: Revert to the following line when https://github.com/okkez/coveralls-lcov/pull/9 is merged and released.
4648
#- if [ -n "${COVERALLS_SERVICE_NAME}" ]; then gem install coveralls-lcov; fi
4749
- 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

src/Regex.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ FindRegexMatch::FindRegexMatch(const boost::regex &regexImpl, const std::string
3131
if (regexMatched) {
3232
boost::smatch::const_iterator i = matchResults.begin();
3333
if (i != matchResults.end())
34+
// Skip capture group 0 which is the whole match, not a user marked sub-expression
3435
++i;
3536
for (; i != matchResults.end(); ++i) {
3637
if (i->matched) {

travis.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
set -e #break script on non-zero exitcode from any command
33
set -x #display command being executed
44

5-
gem install bundler
6-
bundle install
7-
85
CTEST_OUTPUT_ON_FAILURE=ON
96
export CTEST_OUTPUT_ON_FAILURE
107

0 commit comments

Comments
 (0)