From 31258ff03954838debf61db00ad75d7ed153b6d1 Mon Sep 17 00:00:00 2001
From: Jay Conrod <jay@engflow.com>
Date: Wed, 7 Feb 2024 15:34:21 -0800
Subject: [PATCH 1/4] PE-1127: enable Windows remote execution

RELNOTES: none
---
 .github/workflows/main.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 791ffec4..bf12d5df 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -62,6 +62,13 @@ jobs:
             revision: d04e89854b3931f4aaced77aa3a2fcad5834b3a6
             remote_execution: 'true'
 
+          - os: windows
+            arch: x64
+            os_distribution: server
+            os_version: "2022"
+            revision: d04e89854b3931f4aaced77aa3a2fcad5834b3a6
+            remote_execution: 'true'
+
     steps:
       - uses: actions/checkout@v3
 

From 2f0161ffb17e80dc882d8505c201294be9617dab Mon Sep 17 00:00:00 2001
From: Jay Conrod <jay@engflow.com>
Date: Wed, 7 Feb 2024 15:57:37 -0800
Subject: [PATCH 2/4] use --enable_runfiles for python

---
 .bazelrc                   | 1 +
 .github/workflows/main.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.bazelrc b/.bazelrc
index 7d9f98f0..2676cf38 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -63,6 +63,7 @@ build:remote_windows_x64 --compiler=msvc
 build:remote_windows_x64 --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 build:remote_windows_x64 --extra_execution_platforms=//platform/windows_x64
 build:remote_windows_x64 --extra_toolchains=//platform/windows_x64:cc-toolchain
+build:remote_windows_x64 --enable_runfiles
 
 # Options for private EngFlow clusters.
 # To use on your own cluster, change the URLs to your own endpoint.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bf12d5df..9b137ea5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -78,7 +78,7 @@ jobs:
 
       - name: Generate python requirements lock
         shell: bash
-        run: bazel run //python:requirements.update
+        run: bazel run --enable_runfiles //python:requirements.update
 
       - name: Build and test
         env:

From c06d918dd4b23b5edc0dc5992fb83020f4b95e46 Mon Sep 17 00:00:00 2001
From: Jay Conrod <jay@engflow.com>
Date: Wed, 7 Feb 2024 16:04:03 -0800
Subject: [PATCH 3/4] use powershell for that script

---
 .github/workflows/main.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9b137ea5..9907e040 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -76,8 +76,16 @@ jobs:
         shell: bash
         run: cp infra/bazelrc .bazelrc.user
 
-      - name: Generate python requirements lock
+      - name: Generate python requirements lock (bash)
+        if: matrix.os != 'windows' && success()
         shell: bash
+        run: bazel run //python:requirements.update
+
+      # msys2 bash mutates the last argument, removing one of the slashes.
+      # Use powershell instead, even though it's nearly the same command.
+      - name: Generate python requirements lock (powershell)
+        if: matrix.os != 'windows' && success()
+        shell: powershell
         run: bazel run --enable_runfiles //python:requirements.update
 
       - name: Build and test

From 497f6125c13bc22d59bacb4fec5eaab482f34956 Mon Sep 17 00:00:00 2001
From: Jay Conrod <jay@engflow.com>
Date: Wed, 7 Feb 2024 16:12:15 -0800
Subject: [PATCH 4/4] fixes

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9907e040..d9652c5c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -84,7 +84,7 @@ jobs:
       # msys2 bash mutates the last argument, removing one of the slashes.
       # Use powershell instead, even though it's nearly the same command.
       - name: Generate python requirements lock (powershell)
-        if: matrix.os != 'windows' && success()
+        if: matrix.os == 'windows' && success()
         shell: powershell
         run: bazel run --enable_runfiles //python:requirements.update
 
@@ -93,4 +93,4 @@ jobs:
           ARCH: ${{ matrix.arch }}
           OS: ${{ matrix.os }}
           REMOTE_EXECUTION: ${{ matrix.remote_execution }}
-        run: python3 infra/test-all.py
+        run: python infra/test-all.py