From e3b10ad59c9fec609a129d79081c6d99a4866be3 Mon Sep 17 00:00:00 2001
From: Omar Al-Ithawi <i@omardo.com>
Date: Mon, 4 Jan 2021 12:13:04 +0300
Subject: [PATCH] merge tess files

---
 .github/workflows/test.yml  | 36 ++++++++++++++++++++----------------
 .github/workflows/tests.yml | 27 ---------------------------
 2 files changed, 20 insertions(+), 43 deletions(-)
 delete mode 100644 .github/workflows/tests.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c0bd32f..eacd4e8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,23 +1,27 @@
-name: Python application
+name: feedbackxblock
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [master, main]
   pull_request:
-    branches: [ master, main ]
 
 jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
+  test:
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        python-version: [3.5]
+        tox-env:
+          - quality
+          - django22
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.5
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.5
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
+     - uses: actions/checkout@v2
+     - name: Set up Python ${{ matrix.python-version }}
+       uses: actions/setup-python@v2
+       with:
+         python-version: ${{ matrix.python-version }}
+     - name: Install dependencies
+       run: |
+         pip install tox
+     - name: Test with tox
+       run: tox -e ${{ matrix.tox-env }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index eacd4e8..0000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: feedbackxblock
-
-on:
-  push:
-    branches: [master, main]
-  pull_request:
-
-jobs:
-  test:
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-        python-version: [3.5]
-        tox-env:
-          - quality
-          - django22
-    steps:
-     - uses: actions/checkout@v2
-     - name: Set up Python ${{ matrix.python-version }}
-       uses: actions/setup-python@v2
-       with:
-         python-version: ${{ matrix.python-version }}
-     - name: Install dependencies
-       run: |
-         pip install tox
-     - name: Test with tox
-       run: tox -e ${{ matrix.tox-env }}