From 25904e164f10e803be59babed0e55d884f884bc4 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Fri, 11 Dec 2020 12:25:06 -0500
Subject: [PATCH] Removing Postgre, Xenial from testing

---
 .github/scripts/install.sh            | 11 ++---------
 .github/workflows/test-all-Ubuntu.yml | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh
index 7d3f86efe..0edd6ac57 100644
--- a/.github/scripts/install.sh
+++ b/.github/scripts/install.sh
@@ -26,14 +26,7 @@ apt-get install -y gstreamer1.0-plugins-base \
   php \
   php-curl \
   php-gd \
-  php-pgsql \
-  postgresql \
-  postgresql-client
+  php-pgsql
 
-# Creating database for testing
-systemctl restart postgres
-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;'
+# 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 6e54e9801..66ed744fe 100644
--- a/.github/workflows/test-all-Ubuntu.yml
+++ b/.github/workflows/test-all-Ubuntu.yml
@@ -22,15 +22,15 @@ jobs:
       - run: sudo composer install
       - run: sudo bash ./.github/scripts/python-pkg-install.sh
       - run: 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
+  # 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