Don't create virtualenv if running on GitHub

nerc-project · May 19, 2022 · 19d84fc · 19d84fc
1 parent 5a0e3ab
commit 19d84fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ci/run_functional_tests_openshift.sh b/ci/run_functional_tests_openshift.sh
@@ -6,7 +6,9 @@ set -xe
 export OPENSHIFT_MICROSHIFT_USERNAME="admin"
 export OPENSHIFT_MICROSHIFT_PASSWORD="pass"
 
-source /tmp/coldfront_venv/bin/activate
+if [[ ! "${CI}" == "true" ]]; then
+    source /tmp/coldfront_venv/bin/activate
+fi
 
 export DJANGO_SETTINGS_MODULE="local_settings"
 export FUNCTIONAL_TESTS="True"

diff --git a/ci/setup.sh b/ci/setup.sh
@@ -1,7 +1,10 @@
 set -xe
 
-virtualenv -p python3 /tmp/coldfront_venv
-source /tmp/coldfront_venv/bin/activate
+# If running on Github actions, don't create a virtualenv
+if [[ ! "${CI}" == "true" ]]; then
+    virtualenv -p python3 /tmp/coldfront_venv
+    source /tmp/coldfront_venv/bin/activate
+fi
 
 pip3 install -r test-requirements.txt
 pip3 install -e .