From: Kevin Brown <kevin-brown@users.noreply.github.com>
Date: Tue, 7 May 2019 14:38:32 +0000 (-0400)
Subject: Add new maintenance branch format to Travis (#987)
X-Git-Tag: 2.10.2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=323e8928e8c403faec17e743ff3040ee6d9ebc9b;p=thirdparty%2Fjinja.git

Add new maintenance branch format to Travis (#987)

* Added new maintenance branch format to Travis

The maintenance branch format appeared to change from
`[version]-maintenance` to `[version].x` in the recent months, and
this broke Travis CI builds made to those branches. Because they
no longer meet the branch regex, the pull requests builds against
these branches were no longer being run.

This ads the regex for any branch which ends in `.x`, which should
catch the new pattern for maintenance branches.

* Use the branch regex from werkzeug

This is more specific to only catch version number branches.

* Sync with master

Apparently the build configuration for this branch is very old and doesn't match master at all.
---

diff --git a/.travis.yml b/.travis.yml
index 285333fd..a0962237 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,15 @@
+dist: xenial
 sudo: false
 language: python
 
 python:
+  - 3.7
   - 3.6
   - 3.5
   - 3.4
-  - 3.3
   - 2.7
-  - 2.6
-  - pypy
+  - pypy3.5-6.0
+  - pypy2.7-6.0
 
 env:
   - TOXENV=py,codecov
@@ -32,7 +33,7 @@ cache:
 branches:
   only:
     - master
-    - /^.*-maintenance$/
+    - /^\d+(\.\d+)*(\.x)?$/
 
 notifications:
   email: false
@@ -42,4 +43,4 @@ notifications:
     on_success: change
     on_failure: always
     use_notice: true
-    skip_join: true
+    skip_join: true
\ No newline at end of file