fairly major change to structure.. should be clear on which action to…

… navigate to whether its windows/mac
cisagov · Jul 31, 2024 · 7d41b60 · 7d41b60
1 parent 50f8731
commit 7d41b60
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 81 deletions.
diff --git a/...tions/setup-macos-dependencies/action.yml → ...tions/setup-dependencies-macos/action.yml b/...tions/setup-macos-dependencies/action.yml → ...tions/setup-dependencies-macos/action.yml
@@ -1,4 +1,4 @@
-name: Setup MacOS Dependencies
+name: Setup Dependencies (macOS)
 inputs:
   operating-system:
     required: true
@@ -28,4 +28,16 @@ runs:
     
     - name: Download OPA executable
       shell: bash
-      run: python download_opa.py -v ${{ inputs.opa-version }} -os ${{ inputs.operating-system }}
+      run: python download_opa.py -v ${{ inputs.opa-version }} -os ${{ inputs.operating-system }}
+
+    - name: Setup credentials for service account
+      shell: bash
+      run: |
+        echo "in second step"
+        
+        # Give OPA executable execute permissions
+        chmod +x opa_darwin_amd64
+        # Setup credentials for service account
+        echo $env:GWS_GITHUB_AUTOMATION_CREDS
+        echo $env:GWS_GITHUB_AUTOMATION_CREDS >> credentials.json
+        cat credentials.json
diff --git a/...ons/setup-windows-dependencies/action.yml → ...ons/setup-dependencies-windows/action.yml b/...ons/setup-windows-dependencies/action.yml → ...ons/setup-dependencies-windows/action.yml
@@ -1,11 +1,13 @@
-name: Setup Windows Dependencies
+name: Setup Dependencies (Windows)
 inputs:
   operating-system:
     required: true
     default: "windows"
   opa-version:
     required: true
     default: "0.60.0"
+  credentials:
+    required: true
 
 runs:
   using: "composite"
@@ -28,4 +30,8 @@ runs:
     
     - name: Download OPA executable
       shell: powershell
-      run: python download_opa.py -v ${{ inputs.opa-version }} -os ${{ inputs.operating-system }}
+      run: python download_opa.py -v ${{ inputs.opa-version }} -os ${{ inputs.operating-system }}
+
+    - name: Setup credentials for service account
+      shell: powershell
+      run: Set-Content -Path credentials.json -Value ${{ inputs.credentials }}
diff --git a/.github/workflows/run_scubagoggles.yml b/.github/workflows/run_scubagoggles.yml
diff --git a/.github/workflows/run_smoke_test.yml b/.github/workflows/run_smoke_test.yml
@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, macos-latest]
-        python: [3.8, 3.12]
+        python-version: [3.12]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Repository
@@ -34,43 +34,27 @@ jobs:
       - name: Setup Python
         uses: ./.github/actions/setup-python
         with:
-          python-version: ${{ matrix.python }}
+          python-version: ${{ matrix.python-version }}
           cache-dependency-path: "requirements.txt"
 
-      - name: Setup Windows dependencies
+      - name: Run ScubaGoggles (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
-        uses: ./.github/actions/setup-windows-dependencies
+        uses: ./.github/actions/setup-dependencies-windows
         with:
           operating-system: "windows"
           opa-version: "0.60.0"
+          credentials: $env:GWS_GITHUB_AUTOMATION_CREDS
 
-      - name: Setup macOS dependencies
+      - name: Run ScubaGoggles (macOS)
         if: ${{ matrix.os == 'macos-latest' }}
-        uses: ./.github/actions/setup-windows-dependencies
+        uses: ./.github/actions/setup-dependencies-macos
         with:
           operating-system: "macos"
           opa-version: "0.60.0"
+          credentials: $env:GWS_GITHUB_AUTOMATION_CREDS
 
       - name: Execute ScubaGoggles and check for correct output
-        if: ${{ matrix.os == 'windows-latest' }}
-        run: |
-          # Setup credentials for service account
-          Set-Content -Path credentials.json -Value $env:GWS_GITHUB_AUTOMATION_CREDS
-          pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SUBJECT_EMAIL"
-      
-      - name: Execute ScubaGoggles and check for correct output
-        if: ${{ matrix.os == 'macos-latest'  }}
-        run: |
-          echo "in second step"
-          
-          # Give OPA executable execute permissions
-          chmod +x opa_darwin_amd64
-
-          # Setup credentials for service account
-          echo $env:GWS_GITHUB_AUTOMATION_CREDS
-          echo $env:GWS_GITHUB_AUTOMATION_CREDS >> credentials.json
-          cat credentials.json
-          #pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SUBJECT_EMAIL"
+        run: pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SUBJECT_EMAIL"
 
   #smoke-test-windows:
   #  if: false