[py] Fix consolidate workflows

Author: cgoldberg

.github/workflows/ci-python.yml

@@ -66,28 +66,15 @@ jobs:
         include:
           - os: ubuntu
           - os: macos
-    with:
-      name: Unit Tests (${{ matrix.os }})
-      os: ${{ matrix.os }}
-      cache-key: python-unit-test-${{ matrix.os }}
-      run: |
-        bazel test //py:unit
-
-  unit-tests-windows:
-    name: Unit Tests
-    needs: build
-    uses: ./.github/workflows/bazel.yml
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
           - os: windows
     with:
       name: Unit Tests (${{ matrix.os }})
       os: ${{ matrix.os }}
       cache-key: python-unit-test-${{ matrix.os }}
       run: |
-        fsutil 8dot3name set 0
+        if [[ "${{ runner.os }}" == "Windows" ]]; then
+          fsutil 8dot3name set 0
+        fi
         bazel test //py:unit
 
   remote-tests:
@@ -120,24 +107,6 @@ jobs:
             os: ubuntu
           - browser: firefox
             os: ubuntu
-    with:
-      name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
-      browser: ${{ matrix.browser }}
-      os: ${{ matrix.os }}
-      cache-key: py-browser-${{ matrix.browser }}
-      run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true \
-          //py:common-${{ matrix.browser }}-bidi \
-          //py:test-${{ matrix.browser }}
-
-  browser-tests-windows:
-    name: Browser Tests
-    needs: build
-    uses: ./.github/workflows/bazel.yml
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
           - browser: chrome
             os: windows
           - browser: edge
@@ -150,10 +119,10 @@ jobs:
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        fsutil 8dot3name set 0
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true \
-          //py:common-${{ matrix.browser }}-bidi \
-          //py:test-${{ matrix.browser }}
+        if [[ "${{ runner.os }}" == "Windows" ]]; then
+          fsutil 8dot3name set 0
+        fi
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
 
   safari-tests:
     name: Browser Tests
@@ -171,6 +140,4 @@ jobs:
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true \
-          //py:common-${{ matrix.browser }} \
-          //py:test-${{ matrix.browser }}
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }} //py:test-${{ matrix.browser }}