From 5577a29502c1653c2fce2449a63e51450b3ffe33 Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Fri, 13 Nov 2020 16:50:44 +1300
Subject: [PATCH] Clean up graphql 4 travis artifacts

---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5af6806d..3b5b675d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,10 +64,7 @@ before_script:
   - composer require --no-update sminnee/phpunit-mock-objects:^3
   - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
 
-  ######## Remove once GraphQL 4 is merged #########
-  - composer require silverstripe/asset-admin:"dev-pulls/1/schemageddon as 1.x-dev" silverstripe/versioned:"dev-pulls/1/schemageddon as 1.x-dev" silverstripe/graphql:"4.x-dev as 3.x-dev" --no-update
-  ##################################################
-  - 'if [[ $BACKWARD_COMPAT ]]; then composer require silverstripe/graphql:"dev-pulls/3/schemageddon-compat as 3.x-dev" --no-update; fi'
+  - 'if [[ ! $BACKWARD_COMPAT ]]; then composer require silverstripe/graphql:4.x-dev --no-update; fi'
 
   - composer update --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile $COMPOSER_ARG