Merging Bionic and Xenial tests

.github/workflows/test-all-Ubuntu.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
   
 jobs:
-  test-xenial:
+  test-bionic:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
@@ -22,3 +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

.github/workflows/test-xenial.yml

@@ -1,24 +0,0 @@
-name: test-xenial
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'
-  pull_request:
-    types: [opened, ready_for_review, review_requested]
-    paths-ignore:
-    - 'docs/**'
-  workflow_dispatch:
-  
-jobs:
-  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