X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=.travis.yml;h=fcf7accbeaba98e445ab875050bac59d86efd039;hp=c501d03e987f850a5af178566b8f71c2de179779;hb=5cbe5b1216f07b5e329f493bd8bdfa5b0aa0f5eb;hpb=5e99a71adf8f6a6a24f7ea882db880525fb5b7ec

diff --git a/.travis.yml b/.travis.yml
index c501d03..fcf7acc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -118,59 +118,44 @@ matrix:
 # sourcing the files is *EXTREMELY* important - otherwise
 # no envvars will survive
 
-# timeouts below taken from the base and overrides:
-# https://github.com/travis-ci/travis-worker/blob/master/lib/travis/worker/config.rb#L32
-# https://github.com/travis-ci/travis-worker/blob/master/config/worker.php.yml
+# the entire run times out after 50 minutes, or after 5 minutes without
+# console output
 
 before_install:
   # Sets global envvars, downloads/configures debs based on CLEANTEST
   # Sets extra DBICTEST_* envvars
   #
-  # TIMEOUT: 900s
-  #
   - source maint/travis-ci_scripts/10_before_install.bash
 
 install:
   # Build and switch to a custom perl if requested
   # Configure the perl env, preinstall some generic toolchain parts
   #
-  # TIMEOUT: 900s
-  #
   - source maint/travis-ci_scripts/20_install.bash
 
 before_script:
   # Preinstall/install deps based on envvars/CLEANTEST
   #
-  # TIMEOUT: 900s
-  #
   - source maint/travis-ci_scripts/30_before_script.bash
 
 script:
   # Run actual tests
   #
-  # TIMEOUT: 2100s
-  #
   - source maint/travis-ci_scripts/40_script.bash
 
 after_success:
   # Check if we can assemble a dist properly if not in CLEANTEST
   #
-  # TIMEOUT: 300s
-  #
   - source maint/travis-ci_scripts/50_after_success.bash
 
 after_failure:
   # No tasks yet
   #
-  # TIMEOUT: 300s
-  #
   #- source maint/travis-ci_scripts/50_after_failure.bash
 
 after_script:
   # No tasks yet
   #
-  # TIMEOUT: 300s
-  #
   #- source maint/travis-ci_scripts/60_after_script.bash
 
   # if we do not unset this before we terminate the travis teardown will