Merge pull request #579 from acsone/makepot-12

Enable makepot on 12.0 branch
OCA · Oct 19, 2018 · ddfef48 · ddfef48
2 parents 130106d + 48a4aee
commit ddfef48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/travis/test_server.py b/travis/test_server.py
@@ -467,7 +467,8 @@ def main(argv=None):
     must_run_makepot = (
         os.environ.get('MAKEPOT') == '1' and
         os.environ.get('TRAVIS_REPO_SLUG', '').startswith('OCA/') and
-        os.environ.get('TRAVIS_BRANCH') in ('8.0', '9.0', '10.0', '11.0') and
+        os.environ.get('TRAVIS_BRANCH')
+        in ('8.0', '9.0', '10.0', '11.0', '12.0') and
         os.environ.get('TRAVIS_PULL_REQUEST') == 'false' and
         os.environ.get('GITHUB_USER') and
         os.environ.get('GITHUB_EMAIL') and

diff --git a/travis/travis_run_tests b/travis/travis_run_tests
@@ -65,7 +65,8 @@ if __name__ == '__main__':
          os.environ.get('TRANSIFEX') == '1') and
         not tests_enabled and
         is_oca_project and
-        os.environ.get('TRAVIS_BRANCH') in ('8.0', '9.0', '10.0', '11.0') and
+        os.environ.get('TRAVIS_BRANCH')
+        in ('8.0', '9.0', '10.0', '11.0', '12.0') and
         not is_pull_request and
         os.environ.get('GITHUB_USER') and
         os.environ.get('GITHUB_EMAIL') and