From 7bad165adeb174a87163ee792275f570d54cf558 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 16 Dec 2020 15:12:23 -0500
Subject: [PATCH] Changing dependencies

---
 .github/scripts/install-bionic.sh     | 14 ++++-----
 .github/workflows/test-all-Ubuntu.yml | 42 +++++++++++++++++++--------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/.github/scripts/install-bionic.sh b/.github/scripts/install-bionic.sh
index e91c23751..942c0a07e 100644
--- a/.github/scripts/install-bionic.sh
+++ b/.github/scripts/install-bionic.sh
@@ -23,13 +23,13 @@ apt-get install -y gstreamer1.0-plugins-base \
   python-cairo \
   pkg-config \
   libcairo2-dev \
-  php7.2-curl \
-  php7.2-gd \
-  php7.2-pgsql \
-  php7.2-apcu \
-  php7.2-bcmath \
-  php7.2-mbstring \
-  php7.2-pear
+  php-curl \
+  php-gd \
+  php-pgsql \
+  php-apcu \
+  php-bcmath \
+  php-mbstring \
+  php-pear
 
 # Making directory; not sure why...
 mkdir -p /tmp/log/libretime
\ No newline at end of file
diff --git a/.github/workflows/test-all-Ubuntu.yml b/.github/workflows/test-all-Ubuntu.yml
index e4d53eebe..971928a6d 100644
--- a/.github/workflows/test-all-Ubuntu.yml
+++ b/.github/workflows/test-all-Ubuntu.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup PHP with specific version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.0'
+          php-version: '7.2'
       - run: ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime
       - name: Install prerequisites
         run: sudo bash ./.github/scripts/install-bionic.sh
@@ -41,14 +41,32 @@ jobs:
           sudo bash ./.github/scripts/python-pkg-install.sh
           sudo bash ./.github/scripts/python-pkg-test.sh
   # test-xenial:
-  #   runs-on: ubuntu-16.04
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: actions/setup-python@v2
-  #       with:
-  #         python-version: '3.5'
-  #     - run: ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime
-  #     - run: sudo bash ./.github/scripts/install.sh
-  #     - run: sudo composer install
-  #     - run: sudo bash ./.github/scripts/python-pkg-install.sh
-  #     - run: sudo bash ./.github/scripts/python-pkg-test.sh
+    # runs-on: ubuntu-16.04
+    # steps:
+    #   - uses: actions/checkout@v2
+    #   - uses: actions/setup-python@v2
+    #     with:
+    #       python-version: '3.5'
+    #   - name: Setup PostgreSQL
+    #     run: |
+    #       sudo systemctl start postgresql.service
+    #       pg_isready
+    #       sudo -u postgres psql -c 'CREATE DATABASE libretime;'
+    #       sudo -u postgres psql -c "CREATE USER libretime WITH PASSWORD 'libretime';"
+    #       sudo -u postgres psql -c 'GRANT CONNECT ON DATABASE libretime TO libretime;'
+    #       sudo -u postgres psql -c 'ALTER USER libretime CREATEDB;'
+    #   - name: Setup PHP with specific version
+    #     uses: shivammathur/setup-php@v2
+    #     with:
+    #       php-version: '7.0'
+    #   - run: ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime
+    #   - name: Install prerequisites
+    #     run: sudo bash ./.github/scripts/install-xenial.sh
+    #   - name: Run PHP tests
+    #     run: |
+    #       sudo composer install
+    #       cd airtime_mvc/tests && sudo bash ../../vendor/bin/phpunit && cd ../..
+    #   - name: Run Python tests
+    #     run: |
+    #       sudo bash ./.github/scripts/python-pkg-install.sh
+    #       sudo bash ./.github/scripts/python-pkg-test.sh
\ No newline at end of file