try venv experiment

cisagov · Jan 15, 2025 · de2c69b · de2c69b
1 parent 8715985
commit de2c69b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/.github/actions/setup-dependencies-macos/action.yml b/.github/actions/setup-dependencies-macos/action.yml
@@ -9,18 +9,17 @@ inputs:
   python-version:
     required: true
 
+env:
+  venv_activate: "source .venv/bin/activate"
+
 runs:
   using: "composite"
   steps:
-    - name: Setup virtualenv
+    - name: Setup virtual environment and install dependencies
       shell: bash
       run: |
         python -m venv .venv
-        source .venv/bin/activate
-
-    - name: Install dependencies
-      shell: bash
-      run: |
+        $venv_activate
         python -m pip install .
         pip install -r requirements.txt
         pip install pytest
@@ -29,5 +28,6 @@ runs:
     - name: Download OPA executable
       shell: bash
       run: |
+        $venv_activate
         scubagoggles setup -m -nc -nd -d ~/scubagoggles -r ~/scubagoggles -c credentials.json
         scubagoggles getopa -v ${{ inputs.opa-version }}
diff --git a/.github/actions/setup-dependencies-windows/action.yml b/.github/actions/setup-dependencies-windows/action.yml
@@ -9,18 +9,17 @@ inputs:
   python-version:
     required: true
 
+env:
+  venv_activate: ".venv\Scripts\activate.ps1"
+
 runs:
   using: "composite"
   steps:
-    - name: Setup virtualenv
+    - name: Setup virtual environment and install dependencies
       shell: powershell
       run: |
         python -m venv .venv
-        .venv\Scripts\activate.ps1
-
-    - name: Install dependencies
-      shell: powershell
-      run: |
+        $venv_activate
         python -m pip install .
         pip install -r requirements.txt
         pip install pytest
@@ -29,5 +28,6 @@ runs:
     - name: Download OPA executable
       shell: powershell
       run: |
+        $venv_activate
         scubagoggles setup -m -nc -nd -d ~/scubagoggles -r ~/scubagoggles -c credentials.json
         scubagoggles getopa -v ${{ inputs.opa-version }}
diff --git a/.github/workflows/run_smoke_test.yml b/.github/workflows/run_smoke_test.yml
@@ -106,4 +106,6 @@ jobs:
           json: ${{ secrets.GWS_GITHUB_AUTOMATION_CREDS }}
 
       - name: Run ScubaGoggles and check for correct output
-        run: pytest ./scubagoggles/Testing/Functional/SmokeTests/ -vvv --subjectemail="${{ secrets.GWS_SUBJECT_EMAIL }}" --customerdomain="${{ secrets.GWS_DOMAIN }}"
+        run: |
+          $venv_activate
+          pytest ./scubagoggles/Testing/Functional/SmokeTests/ -vvv --subjectemail="${{ secrets.GWS_SUBJECT_EMAIL }}" --customerdomain="${{ secrets.GWS_DOMAIN }}"