Merge pull request #65 from creative-commoners/master

Patch travis configs, remove branch alias
symbiote · Nov 13, 2019 · 4bb764d · 4bb764d
2 parents 360ef77 + 7edf9a9
commit 4bb764d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,14 @@
 # See https://github.com/silverstripe/silverstripe-travis-support for setup details
 
-dist: trusty
+dist: xenial
+
+services:
+  - mysql
 
 language: php
 
 matrix:
   include:
-    - php: '5.6'
-      env: DB=MYSQL CORE_RELEASE=3.6
-    - php: '7.0'
-      env: DB=MYSQL CORE_RELEASE=3.7
     - php: '7.1'
       env: DB=MYSQL CORE_RELEASE=3.7
     - php: '7.2'

diff --git a/composer.json b/composer.json
@@ -17,10 +17,7 @@
         "silverstripe/cms": "~3.1"
     },
     "extra": {
-        "installer-name": "versionedfiles",
-        "branch-alias": {
-            "dev-master": "2.1.x-dev"
-        }
+        "installer-name": "versionedfiles"
     },
     "replace": {
         "silverstripe/versionedfiles": "self.version"