lets see if refactoring into separate workflow changes things

cisagov · Jul 30, 2024 · 8bc89a2 · 8bc89a2
1 parent b9d9878
commit 8bc89a2
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 32 deletions.
diff --git a/.github/workflows/run_scubagoggles.yml b/.github/workflows/run_scubagoggles.yml
@@ -0,0 +1,52 @@
+name: Run ScubaGoggles
+on:
+  workflow_call:
+    inputs:
+      os:
+        required: true
+  workflow_dispatch:
+
+jobs:
+  run-scubagoggles-windows:
+    if: ${{ inputs.os }} == "windows-latest"
+    runs-on: windows-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Setup dependencies
+        uses: ./.github/actions/setup-windows-dependencies
+        with:
+          operating-system: "windows"
+          opa-version: "0.60.0"
+
+      - name: Execute ScubaGoggles and check for correct output
+        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"
+
+  run-scubagoggles-macos:
+    if: ${{ inputs.os }} == "macos-latest"
+    runs-on: macos-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Setup dependencies
+        uses: ./.github/actions/setup-macos-dependencies
+        with:
+          operating-system: "macos"
+          opa-version: "0.60.0"
+
+      - name: Execute ScubaGoggles and check for correct output
+        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"
diff --git a/.github/workflows/run_smoke_test.yml b/.github/workflows/run_smoke_test.yml
@@ -37,40 +37,44 @@ jobs:
           python-version: ${{ matrix.python }}
           cache-dependency-path: "requirements.txt"
 
-      - name: Setup Windows dependencies
-        if: ${{ matrix.os == "windows-latest" }} 
-        uses: ./.github/actions/setup-windows-dependencies
-        with:
-          operating-system: "windows"
-          opa-version: "0.60.0"
-
-      - name: Setup macOS dependencies
-        if: ${{ matrix.os == "macos-latest" }} 
-        uses: ./.github/actions/setup-windows-dependencies
-        with:
-          operating-system: "macos"
+      - name: Setup and Run ScubaGoggles
+        uses: ./.github/workflows/run_scubagoggles
+        with: 
+          os: ${{ matrix.os }}
           opa-version: "0.60.0"
-
-      - 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"
+      #- name: Setup Windows dependencies
+      #  uses: ./.github/actions/setup-windows-dependencies
+      #  with:
+      #    operating-system: "windows"
+      #    opa-version: "0.60.0"
+      #
+      #- name: Setup macOS dependencies
+      #  uses: ./.github/actions/setup-windows-dependencies
+      #  with:
+      #    operating-system: "macos"
+      #    opa-version: "0.60.0"
+#
+      #- 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"
 
   #smoke-test-windows:
   #  if: false