From 8c32a7ef23ce3c819acc5c804d778fcb1509b1ac Mon Sep 17 00:00:00 2001 From: RussH Date: Mon, 6 Mar 2023 16:26:07 +0000 Subject: [PATCH] Move to docker-compose 2 for travisci (#593) * Update .travis.yml * travis-ci fixes for docker-compose v2 and finally - a minor correction for spelling :-( --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46c05e0a8..2a3e2951c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ services: - docker env: - COMPOSE_VERSION: 1.25.3 + COMPOSE_VERSION: v2.16.0 before_install: - sudo apt-get update -qq @@ -15,13 +15,12 @@ before_install: language: php php: - 7.2 -- 7.3 -- 7.4 script: + - composer self-update --2 - composer install - ./vendor/bin/phpunit src/OpenCATS/Tests/UnitTests - - cd docker/; docker-compose -f docker-compose-test.yml up -d - - docker-compose -f docker-compose-test.yml exec php /var/www/public/test/runAllTests.sh + - cd docker/; docker-compose --compatibility -f docker-compose-test.yml up -d + - docker-compose --compatibility -f docker-compose-test.yml exec php /var/www/public/test/runAllTests.sh - cd ..; ./ci/package-code.sh deploy: