From 8660ddf7917775574141fc25b82412d8cde6e6b9 Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Mon, 18 Nov 2019 10:07:48 +1300
Subject: [PATCH] Fix travis ci; delete branch aliases

---
 .travis.yml   | 23 ++++++++++++++---------
 composer.json |  5 +----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7140b49..9b664a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,30 @@
 language: php
 
+dist: xenial
+
+services:
+  - mysql
+  - postgresql
+
+
 matrix:
   include:
-    - php: 5.6
-      env: DB=MYSQL RECIPE_VERSION=1.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
-    - php: 7.0
-      env: DB=MYSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.1
+      env: DB=PGSQL PHPUNIT_TEST=1
     - php: 7.2
-      env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
     - php: 7.3
-      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL PHPUNIT_TEST=1 PHPUNIT_COVERAGE_TEST=1
 
 before_script:
   - phpenv rehash
   - phpenv config-rm xdebug.ini
 
   - composer validate
-  - composer require silverstripe/recipe-cms:"$RECIPE_VERSION"  --no-update
-  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --no-update; fi
+  - composer require silverstripe/recipe-cms:^4  --no-update
+  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:^2 --no-update; fi
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:
diff --git a/composer.json b/composer.json
index 6cbc3c1..849bb1a 100644
--- a/composer.json
+++ b/composer.json
@@ -35,10 +35,7 @@
         "expose": [
             "css",
             "javascript"
-        ],
-        "branch-alias": {
-            "dev-master": "4.x-dev"
-        }
+        ]
     },
     "replace": {
         "ajshort/silverstripe-gridfieldextensions": "self.version",