From 572a3a273c9710d2a007cee4ee03d9341f9852c6 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Thu, 17 Dec 2020 09:44:18 -0500 Subject: [PATCH] Updating Composer dependencies --- .github/scripts/install-xenial.sh | 2 -- .github/workflows/test-all-Ubuntu.yml | 3 ++- composer.json | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/scripts/install-xenial.sh b/.github/scripts/install-xenial.sh index 78a015df3..b89e397d2 100644 --- a/.github/scripts/install-xenial.sh +++ b/.github/scripts/install-xenial.sh @@ -23,8 +23,6 @@ apt-get install -y gstreamer1.0-plugins-base \ python-cairo \ pkg-config \ libcairo2-dev \ - postgresql \ - postgresql-client \ php7.0-curl \ php7.0-gd \ php7.0-pgsql \ diff --git a/.github/workflows/test-all-Ubuntu.yml b/.github/workflows/test-all-Ubuntu.yml index b227ed0b4..bb9d888c9 100644 --- a/.github/workflows/test-all-Ubuntu.yml +++ b/.github/workflows/test-all-Ubuntu.yml @@ -65,10 +65,11 @@ jobs: run: sudo bash ./.github/scripts/install-xenial.sh - name: Run Python tests run: | + pip3 install --upgrade pip sudo bash ./.github/scripts/python-pkg-install.sh sudo bash ./.github/scripts/python-pkg-test.sh - name: Run PHP tests run: | - composer install --no-progress + composer install --no-progress --dev cd airtime_mvc/tests sudo bash ../../vendor/bin/phpunit \ No newline at end of file diff --git a/composer.json b/composer.json index a5cae5d09..093da408b 100644 --- a/composer.json +++ b/composer.json @@ -39,8 +39,8 @@ "zf1s/zend-cache": "dev-master@dev" }, "require-dev": { - "phpunit/phpunit": "^4.3", - "phpunit/dbunit": "^2.0", + "phpunit/phpunit": "^6", + "phpunit/dbunit": "^3.0", "zf1s/zend-test": "^1.12" } }