From 60c7c41639b0c8060d9e2cb699f6e7ee757b0f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan-Cristian=20T=C4=83t=C4=83roiu?=
 <b.tataroiu@gmail.com>
Date: Mon, 20 May 2024 11:24:26 +0100
Subject: [PATCH] Fix Windows CI.

It's currently failing when running tests with errors of the form:

> error: creating test list failed
>
> Caused by:
>   for `wezterm-config-derive`, command
>   `'D:\a\wezterm\wezterm\target\debug\deps\wezterm_config_derive-f1c7f0f2de220b6e.exe'
>   --list --format terse` exited with code 0xc0000135: The specified
>   module could not be found. (os error 126)

This seems to have been caused by nextest-rs/nextest#1493, with this comment
as a fix: https://github.com/nextest-rs/nextest/issues/1493#issuecomment-2106331574
---
 .github/workflows/gen_windows.yml            | 1 +
 .github/workflows/gen_windows_continuous.yml | 1 +
 .github/workflows/gen_windows_tag.yml        | 1 +
 ci/generate-workflows.py                     | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/.github/workflows/gen_windows.yml b/.github/workflows/gen_windows.yml
index 22f36ec98bb..6dad080d180 100644
--- a/.github/workflows/gen_windows.yml
+++ b/.github/workflows/gen_windows.yml
@@ -23,6 +23,7 @@ jobs:
       CARGO_INCREMENTAL: "0"
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
+      RUSTUP_WINDOWS_PATH_ADD_BIN: "1"
 
     steps:
       - name: "checkout repo"
diff --git a/.github/workflows/gen_windows_continuous.yml b/.github/workflows/gen_windows_continuous.yml
index 0d9701ddc55..4c6031f7ad1 100644
--- a/.github/workflows/gen_windows_continuous.yml
+++ b/.github/workflows/gen_windows_continuous.yml
@@ -26,6 +26,7 @@ jobs:
       CARGO_INCREMENTAL: "0"
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
+      RUSTUP_WINDOWS_PATH_ADD_BIN: "1"
 
     steps:
       - name: "checkout repo"
diff --git a/.github/workflows/gen_windows_tag.yml b/.github/workflows/gen_windows_tag.yml
index 9a067256f72..235be6c33b3 100644
--- a/.github/workflows/gen_windows_tag.yml
+++ b/.github/workflows/gen_windows_tag.yml
@@ -13,6 +13,7 @@ jobs:
       CARGO_INCREMENTAL: "0"
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
+      RUSTUP_WINDOWS_PATH_ADD_BIN: "1"
 
     steps:
       - name: "checkout repo"
diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py
index c241b16f072..8f6f37fd76d 100755
--- a/ci/generate-workflows.py
+++ b/ci/generate-workflows.py
@@ -812,6 +812,8 @@ def global_env(self):
             self.env["MACOSX_DEPLOYMENT_TARGET"] = "10.9"
         if "alpine" in self.name:
             self.env["RUSTFLAGS"] = "-C target-feature=-crt-static"
+        if "win" in self.name:
+            self.env["RUSTUP_WINDOWS_PATH_ADD_BIN"] = "1"
         return
 
     def prep_environment(self, cache=True):