Skip to content

Commit e5a3441

Browse files
committed
Land rapid7#9020, fix rapid7#9019 - Travis Timeouts on build
2 parents 9b75ef7 + 5c0bb26 commit e5a3441

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

.travis.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,15 @@ env:
2121

2222
matrix:
2323
fast_finish: true
24+
25+
jobs:
26+
# build docker image
2427
include:
25-
- rvm: ruby-head
26-
env: CMD="docker-compose -f $TRAVIS_BUILD_DIR/docker-compose.yml build"
28+
- env: CMD="docker-compose -f $TRAVIS_BUILD_DIR/docker-compose.yml build" DOCKER="true"
29+
# we do not need any setup
30+
before_install: skip
31+
install: skip
32+
before_script: skip
2733
before_install:
2834
- "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
2935
- rake --version
@@ -42,7 +48,8 @@ before_script:
4248
- git diff --exit-code db/schema.rb
4349
script:
4450
- echo "${CMD}"
45-
- bash -c "${CMD}"
51+
# we need travis_wait because the Docker build job can take longer than 10 minutes
52+
- if [[ "${DOCKER}" == "true" ]]; then echo "Starting Docker build job"; travis_wait 40 "${CMD}"; else bash -c "${CMD}"; fi
4653

4754
notifications:
4855
irc: "irc.freenode.org#msfnotify"

0 commit comments

Comments
 (0)