From d1dd1ff0ab0780b1d24fa2347727d1412223d0e4 Mon Sep 17 00:00:00 2001
From: Henry Mercer <henrymercer@github.com>
Date: Tue, 8 Feb 2022 11:28:37 +0000
Subject: [PATCH] Run Python auto package installation CI job for Python 2 on
 Windows 2019

This job isn't working on Windows Server 2022, i.e. `windows-latest`.
We're tracking the issue internally, but until then it shouldn't fail CI
for the Action.
---
 .github/workflows/python-deps.yml | 35 ++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml
index 0e3e656640..64072160b7 100644
--- a/.github/workflows/python-deps.yml
+++ b/.github/workflows/python-deps.yml
@@ -1,4 +1,4 @@
-name: Test Python Package Installation on Linux and Mac
+name: Test Python Package Installation
 
 on:
   push:
@@ -12,11 +12,11 @@ jobs:
   test-setup-python-scripts:
     runs-on: ${{ matrix.os }}
     strategy:
-        fail-fast: false
-        matrix:
-          os: [ubuntu-latest, macos-latest]
-          python_deps_type: [pipenv, poetry, requirements, setup_py]
-          python_version: [2, 3]
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python_deps_type: [pipenv, poetry, requirements, setup_py]
+        python_version: [2, 3]
 
     env:
       PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }}
@@ -64,9 +64,9 @@ jobs:
   test-setup-python-scripts-non-standard-location:
     runs-on: ${{ matrix.os }}
     strategy:
-        fail-fast: false
-        matrix:
-          os: [ubuntu-latest, macos-latest]
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
 
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -108,12 +108,19 @@ jobs:
         test -z $LGTM_INDEX_IMPORT_PATH
 
   test-setup-python-scripts-windows:
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
     strategy:
-        fail-fast: false
-        matrix:
-          python_deps_type: [pipenv, poetry, requirements, setup_py]
-          python_version: [2, 3]
+      fail-fast: false
+      matrix:
+        python_deps_type: [pipenv, poetry, requirements, setup_py]
+        python_version: [2, 3]
+        include:
+          - python_version: 3
+            os: windows-latest
+          # Python 2 auto package installation does not work on Windows Server 2022. This is being
+          # tracked internally.
+          - python_version: 2
+            os: windows-2019
 
     env:
       PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }}