From b655803bf5270f0b58ec5fa3d0270e6a2049b841 Mon Sep 17 00:00:00 2001
From: DevilXD <4180725+DevilXD@users.noreply.github.com>
Date: Sat, 20 Jan 2024 13:15:11 +0100
Subject: [PATCH] Don't need to use venv in CI builds

---
 .github/workflows/ci.yml | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95ac337..d71520b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Append git revision to project version
         run: |
           (Get-Content version.py) `
-          -Replace '^__version__\s*=\s*"[^"]+', "`$0.${{ steps.vars.outputs.sha_short }}" |`
+          -Replace '^__version__\s*=\s*"[^"]+', "`$0.${{steps.vars.outputs.sha_short}}" |`
           Out-File version.py
 
       # Ensure Python version
@@ -36,14 +36,10 @@ jobs:
         with:
           python-version: ${{env.PYTHON_VERSION}}
 
-      - name: Set up Python virtual environment
-        run: |
-          python3 -m venv env
-
       - name: Install project dependencies
         run: |
-          .\env\Scripts\activate
-          python3 -m pip install wheel -r requirements.txt
+          python3 -m pip install wheel
+          python3 -m pip install -r requirements.txt
 
       - name: Install UPX
         run: |
@@ -54,12 +50,10 @@ jobs:
 
       - name: Install PyInstaller
         run: |
-          .\env\Scripts\activate
           python3 -m pip install pyinstaller
 
       - name: Create portable executable
         run: |
-          .\env\Scripts\activate
           pyinstaller build.spec
 
       - name: Create release folder
@@ -105,18 +99,13 @@ jobs:
           sudo apt update
           sudo apt install gir1.2-appindicator3-0.1 libgirepository1.0-dev python3-tk
 
-      - name: Set up Python virtual environment
-        run: |
-          python3 -m venv env
-
       - name: Install project dependencies
         run: |
-          source ./env/bin/activate
-          python3 -m pip install wheel -r requirements.txt
+          python3 -m pip install wheel
+          python3 -m pip install -r requirements.txt
 
       - name: Install PyInstaller
         run: |
-          source ./env/bin/activate
           python3 -m pip install pyinstaller
 
       # NOTE: Remove this step if/once libxft gets updated to 2.3.5 or newer on Ubuntu 20.04, which currently has 2.3.3.
@@ -133,7 +122,6 @@ jobs:
 
       - name: Create portable executable
         run: |
-          source ./env/bin/activate
           LD_LIBRARY_PATH=/tmp/libXft/lib xvfb-run --auto-servernum pyinstaller build.spec
 
       - name: Show PyInstaller warnings
@@ -176,7 +164,7 @@ jobs:
 
       - name: Append git revision to project version
         run: |
-          sed -ri "s/^__version__\s*=\s*\"[^\"]+/\0.${{ steps.vars.outputs.sha_short }}/" version.py
+          sed -ri "s/^__version__\s*=\s*\"[^\"]+/\0.${{steps.vars.outputs.sha_short}}/" version.py
 
       - name: Install system dependencies
         run: |