From 8fb8336bb397fdb3afc8faaffaace117c6a21fe8 Mon Sep 17 00:00:00 2001
From: Matteo Bettini <matbet@meta.com>
Date: Wed, 20 Sep 2023 23:04:57 +0100
Subject: [PATCH] amend

Signed-off-by: Matteo Bettini <matbet@meta.com>
---
 .github/unittest/install_smacv2.sh | 3 +++
 .github/unittest/install_vmas.sh   | 2 --
 .github/workflows/lint.yml         | 3 +--
 .github/workflows/smacv2_tests.yml | 3 ---
 .github/workflows/vmas_tests.yml   | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/unittest/install_smacv2.sh b/.github/unittest/install_smacv2.sh
index fd57cf0a..3dee157c 100644
--- a/.github/unittest/install_smacv2.sh
+++ b/.github/unittest/install_smacv2.sh
@@ -18,5 +18,8 @@ mkdir "${map_dir}/SMAC_Maps"
 mv *.SC2Map "${map_dir}/SMAC_Maps"
 printf "StarCraft II and SMAC are installed."
 
+export SC2PATH="${root_dir}/StarCraftII"
+echo 'SC2PATH is set to ' "$SC2PATH"
+
 pip install numpy==1.23.0
 pip install git+https://github.com/oxwhirl/smacv2.git
diff --git a/.github/unittest/install_vmas.sh b/.github/unittest/install_vmas.sh
index 19da1efb..86c7ebf4 100644
--- a/.github/unittest/install_vmas.sh
+++ b/.github/unittest/install_vmas.sh
@@ -2,5 +2,3 @@
 python -m pip install vmas
 sudo apt-get update
 sudo apt-get install python3-opengl xvfb
-export DISPLAY=':99.0'
-Xvfb :99 -screen 0 1400x900x24 > /dev/null 2>&1 &
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6f0dfad3..ff470a37 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -32,8 +32,7 @@ jobs:
     - name: Lint
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8
-        pip install --progress-bar=off pre-commit
+        pip install pre-commit
         
         set +e
         pre-commit run --all-files
diff --git a/.github/workflows/smacv2_tests.yml b/.github/workflows/smacv2_tests.yml
index 459ba902..e09be7b5 100644
--- a/.github/workflows/smacv2_tests.yml
+++ b/.github/workflows/smacv2_tests.yml
@@ -38,7 +38,4 @@ jobs:
 
     - name: Test with pytest
       run: |
-        root_dir="$(git rev-parse --show-toplevel)"
-        export SC2PATH="${root_dir}/StarCraftII"
-        echo 'SC2PATH is set to ' "$SC2PATH"
         pytest test/test_smacv2.py --doctest-modules --junitxml=junit/test-results.xml --cov=. --cov-report=xml --cov-report=html
diff --git a/.github/workflows/vmas_tests.yml b/.github/workflows/vmas_tests.yml
index 7901f541..8925918a 100644
--- a/.github/workflows/vmas_tests.yml
+++ b/.github/workflows/vmas_tests.yml
@@ -34,7 +34,6 @@ jobs:
     - name: Install vmas
       run: |
        bash .github/unittest/install_vmas.sh
-
     - name: Test with pytest
       run: |
-        pytest test/test_vmas.py --doctest-modules --junitxml=junit/test-results.xml --cov=. --cov-report=xml --cov-report=html
+        xvfb-run -s "-screen 0 1024x768x24" pytest test/test_vmas.py --doctest-modules --junitxml=junit/test-results.xml --cov=. --cov-report=xml --cov-report=html