From 6f07273482fad7036d83cb0bc80153061798224d Mon Sep 17 00:00:00 2001
From: Elias Müller <elias.mr1@gmail.com>
Date: Sat, 9 Jul 2022 19:45:07 +0200
Subject: Cleanup pipeline

---
 .github/workflows/tests.yml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 78a5f1a..7e0c067 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,6 @@ jobs:
     name: 'Linux - Python'
     strategy:
       matrix:
-        # '3.7' -> E   ImportError: cannot import name 'InvalidStateError' from 'concurrent.futures' (/opt/hostedtoolcache/Python/3.7.13/x64/lib/python3.7/concurrent/futures/__init__.py)
         python-version: [ '3.8', '3.9', '3.10' ]
     env:
       DISPLAY: :0
@@ -32,18 +31,21 @@ jobs:
       - name: 'Update Packages'
         run: |
           function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
+
           execute sudo apt update -y && sudo apt upgrade -y
       - name: 'Install Dependencies'
         run: |
           function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
+
           execute sudo apt install -y libmpv1 xvfb
       - name: 'Start Xvfb'
         run: |
           echo -e "\033[0;34msudo /usr/bin/Xvfb $DISPLAY -screen 0 1920x1080x24 &\033[0m";
           sudo /usr/bin/Xvfb $DISPLAY -screen 0 1920x1080x24 &
-      - name: 'Create Virtual Environment'
+      - name: 'Setup Test Environment'
         run: |
           function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
+          
           execute python -m venv venv
           execute source venv/bin/activate
           execute python -m pip install --upgrade pip
@@ -52,6 +54,7 @@ jobs:
       - name: 'Run Python Tests'
         run: |
           function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
+          
           execute source venv/bin/activate
           execute xvfb-run python -m pytest
 
@@ -67,14 +70,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: 'Setup Build Environment'
-        run: |
-          function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
-          execute python -m venv venv
-          execute source venv/Scripts/activate
-          execute python -m pip install --upgrade pip
-          execute python -m pip install wheel
-          execute python -m pip install -r tests/requirements.txt
       - name: 'Provide libmpv'
         run: |
           function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
@@ -85,8 +80,18 @@ jobs:
           execute curl -L -O "$URL"
           execute 7z x "$ARTIFACT"
           execute mv mpv-2.dll tests
+      - name: 'Setup Test Environment'
+        run: |
+          function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
+
+          execute python -m venv venv
+          execute source venv/Scripts/activate
+          execute python -m pip install --upgrade pip
+          execute python -m pip install wheel
+          execute python -m pip install -r tests/requirements.txt
       - name: 'Run Python Tests'
         run: |
           function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
+
           execute source venv/Scripts/activate
           execute python -m pytest
-- 
cgit