From e06c3aaff1515ec32520bbf863edc93f83feb41d Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 05:58:42 +0000
Subject: [PATCH 001/168] Fix bootstrap issue with git on MSYS

src/bootstrap runs git to find the root of the repository, but this can
go awry when building in MSYS for the mingw target. This is because
MSYS git returns a unix-y path, but bootstrap requires a Windows-y path.
---
 src/bootstrap/src/core/config/config.rs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 2eb5d06bcb3bb..95817dee8f2f6 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -1137,12 +1137,16 @@ impl Config {
         // Infer the rest of the configuration.
 
         // Infer the source directory. This is non-trivial because we want to support a downloaded bootstrap binary,
-        // running on a completely machine from where it was compiled.
+        // running on a completely different machine from where it was compiled.
         let mut cmd = Command::new("git");
-        // NOTE: we cannot support running from outside the repository because the only path we have available
-        // is set at compile time, which can be wrong if bootstrap was downloaded from source.
+        // NOTE: we cannot support running from outside the repository because the only other path we have available
+        // is set at compile time, which can be wrong if bootstrap was downloaded rather than compiled locally.
         // We still support running outside the repository if we find we aren't in a git directory.
-        cmd.arg("rev-parse").arg("--show-toplevel");
+
+        // NOTE: We get a relative path from git to work around an issue on MSYS/mingw. If we used an absolute path,
+        // and end up using MSYS's git rather than git-for-windows, we would get a unix-y MSYS path. But as bootstrap
+        // has already been (kinda-cross-)compiled to Windows land, we require a normal Windows path.
+        cmd.arg("rev-parse").arg("--show-cdup");
         // Discard stderr because we expect this to fail when building from a tarball.
         let output = cmd
             .stderr(std::process::Stdio::null())
@@ -1150,9 +1154,14 @@ impl Config {
             .ok()
             .and_then(|output| if output.status.success() { Some(output) } else { None });
         if let Some(output) = output {
-            let git_root = String::from_utf8(output.stdout).unwrap();
-            // We need to canonicalize this path to make sure it uses backslashes instead of forward slashes.
-            let git_root = PathBuf::from(git_root.trim()).canonicalize().unwrap();
+            let git_root_relative = String::from_utf8(output.stdout).unwrap();
+            // We need to canonicalize this path to make sure it uses backslashes instead of forward slashes,
+            // and to resolve any relative components.
+            let git_root = env::current_dir()
+                .unwrap()
+                .join(PathBuf::from(git_root_relative.trim()))
+                .canonicalize()
+                .unwrap();
             let s = git_root.to_str().unwrap();
 
             // Bootstrap is quite bad at handling /? in front of paths

From b0dacf937a4f4a124ed32422d4f818a19b7b8e5b Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 10:50:01 +0000
Subject: [PATCH 002/168] TEMP CI TEST COMMIT

---
 src/ci/github-actions/ci.yml    | 50 +++++++++++++++++++++++++++++++++
 src/ci/scripts/install-mingw.sh |  6 +++-
 src/ci/scripts/install-msys2.sh |  8 ++++--
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index da29ffb8e5f9b..8cb360d98f53b 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -341,6 +341,56 @@ jobs:
 
           - name: x86_64-gnu-tools
             <<: *job-linux-16c
+          
+          - name: i686-mingw
+            env:
+              RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
+              SCRIPT: make ci-mingw
+              # We are intentionally allowing an old toolchain on this builder (and that's
+              # incompatible with LLVM downloads today).
+              NO_DOWNLOAD_CI_LLVM: 1
+              CUSTOM_MINGW: 1
+            <<: *job-windows-8c
+
+          - name: x86_64-mingw
+            env:
+              SCRIPT: make ci-mingw
+              RUST_CONFIGURE_ARGS: >-
+                --build=x86_64-pc-windows-gnu
+                --enable-profiler
+              # We are intentionally allowing an old toolchain on this builder (and that's
+              # incompatible with LLVM downloads today).
+              NO_DOWNLOAD_CI_LLVM: 1
+              CUSTOM_MINGW: 1
+            <<: *job-windows-8c
+          
+          - name: dist-i686-mingw
+            env:
+              RUST_CONFIGURE_ARGS: >-
+                --build=i686-pc-windows-gnu
+                --enable-full-tools
+                --enable-profiler
+              # We are intentionally allowing an old toolchain on this builder (and that's
+              # incompatible with LLVM downloads today).
+              NO_DOWNLOAD_CI_LLVM: 1
+              SCRIPT: python x.py dist bootstrap --include-default-paths
+              CUSTOM_MINGW: 1
+              DIST_REQUIRE_ALL_TOOLS: 1
+            <<: *job-windows-8c
+
+          - name: dist-x86_64-mingw
+            env:
+              SCRIPT: python x.py dist bootstrap --include-default-paths
+              RUST_CONFIGURE_ARGS: >-
+                --build=x86_64-pc-windows-gnu
+                --enable-full-tools
+                --enable-profiler
+              # We are intentionally allowing an old toolchain on this builder (and that's
+              # incompatible with LLVM downloads today).
+              NO_DOWNLOAD_CI_LLVM: 1
+              CUSTOM_MINGW: 1
+              DIST_REQUIRE_ALL_TOOLS: 1
+            <<: *job-windows-8c
 
   auto:
     <<: *base-ci-job
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 7eccb9b86502c..0ac2e98668cfa 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -13,6 +13,8 @@ MINGW_ARCHIVE_32="i686-12.2.0-release-posix-dwarf-rt_v10-rev0.7z"
 MINGW_ARCHIVE_64="x86_64-12.2.0-release-posix-seh-rt_v10-rev0.7z"
 
 if isWindows; then
+    echo "MAJAHA 3: $(cygpath -w $(which git))"
+    echo "MAJAHA 3: $(cygpath -w $(which python))"
     case "${CI_JOB_NAME}" in
         *i686*)
             bits=32
@@ -41,13 +43,15 @@ if isWindows; then
     if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
         pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
             mingw-w64-$arch-gcc \
-            mingw-w64-$arch-python # the python package is actually for python3
+            mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
         ciCommandAddPath "$(ciCheckoutPath)/msys2/mingw${bits}/bin"
+        echo "CUSTOM MINGW PATH 0"
     else
         mingw_dir="mingw${bits}"
 
         curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
         7z x -y mingw.7z > /dev/null
         ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
+        echo "CUSTOM MINGW PATH 1"
     fi
 fi
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 0aa4b42a6a8fb..ceff8bb63bb97 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -8,9 +8,11 @@ IFS=$'\n\t'
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
 if isWindows; then
+    echo "MAJAHA 1: $(cygpath -w $(which git))"
     msys2Path="c:/msys64"
     mkdir -p "${msys2Path}/home/${USERNAME}"
-    ciCommandAddPath "${msys2Path}/usr/bin"
+    ciCommandAddPath "${msys2Path}/usr/bin" # This is what rotates the CI shell from Git bash to msys bash i think
+    echo "MAJAHA 2: $(cygpath -w $(which git))"
 
     # Detect the native Python version installed on the agent. On GitHub
     # Actions, the C:\hostedtoolcache\windows\Python directory contains a
@@ -27,6 +29,8 @@ if isWindows; then
     if ! [[ -f "${python_home}/python3.exe" ]]; then
         cp "${python_home}/python.exe" "${python_home}/python3.exe"
     fi
+    echo "MAJAHA 1: $(cygpath -w $(which python))"
     ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
+    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts" # should try to remove windows git from the path.
+    echo "MAJAHA 2: $(cygpath -w $(which python))"
 fi

From 5a1a8e775135e1a66590a4794a86e780e2007eb7 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 003/168] TEMP CI 2

---
 .github/workflows/ci.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5f659a1c3060c..d78ab1b645c95 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,6 +63,36 @@ jobs:
           - name: x86_64-gnu-tools
             os: ubuntu-20.04-16core-64gb
             env: {}
+          - name: i686-mingw
+            env:
+              RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
+              SCRIPT: make ci-mingw
+              NO_DOWNLOAD_CI_LLVM: 1
+              CUSTOM_MINGW: 1
+            os: windows-2019-8core-32gb
+          - name: x86_64-mingw
+            env:
+              SCRIPT: make ci-mingw
+              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
+              NO_DOWNLOAD_CI_LLVM: 1
+              CUSTOM_MINGW: 1
+            os: windows-2019-8core-32gb
+          - name: dist-i686-mingw
+            env:
+              RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
+              NO_DOWNLOAD_CI_LLVM: 1
+              SCRIPT: python x.py dist bootstrap --include-default-paths
+              CUSTOM_MINGW: 1
+              DIST_REQUIRE_ALL_TOOLS: 1
+            os: windows-2019-8core-32gb
+          - name: dist-x86_64-mingw
+            env:
+              SCRIPT: python x.py dist bootstrap --include-default-paths
+              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
+              NO_DOWNLOAD_CI_LLVM: 1
+              CUSTOM_MINGW: 1
+              DIST_REQUIRE_ALL_TOOLS: 1
+            os: windows-2019-8core-32gb
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:

From 1207054fd1f2e850dd14b009b0d649540fb046cf Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 004/168] TEMP CI 3

---
 src/bootstrap/mk/Makefile.in    | 2 +-
 src/ci/scripts/install-mingw.sh | 2 ++
 src/ci/scripts/install-msys2.sh | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 0b67079917c7f..2d9416a823ee3 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -77,7 +77,7 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:
-	$(Q)$(CFG_SRC_DIR)/x test --stage 2 tidy
+	$(Q)$(CFG_SRC_DIR)/x test --stage 2 --skip tidy
 ci-mingw-bootstrap:
 	$(Q)$(BOOTSTRAP) test --stage 2 --skip tidy
 ci-mingw: ci-mingw-x ci-mingw-bootstrap
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 0ac2e98668cfa..b66e8f056f061 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -54,4 +54,6 @@ if isWindows; then
         ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
         echo "CUSTOM MINGW PATH 1"
     fi
+    echo "MAJAHA 4: $(cygpath -w $(which git))"
+    echo "MAJAHA 4: $(cygpath -w $(which python))"
 fi
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index ceff8bb63bb97..d2802471f2e24 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -8,6 +8,7 @@ IFS=$'\n\t'
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
 if isWindows; then
+    echo "MAJAHA PWD: $(pwd)"
     echo "MAJAHA 1: $(cygpath -w $(which git))"
     msys2Path="c:/msys64"
     mkdir -p "${msys2Path}/home/${USERNAME}"

From 36cb910f3b755a3844438fb7f19f586e3489ec16 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 005/168] TEMP CI 4

---
 .github/workflows/ci.yml        | 13 -------------
 src/ci/github-actions/ci.yml    | 14 --------------
 src/ci/scripts/install-mingw.sh |  2 +-
 src/ci/scripts/install-msys2.sh |  8 +++++---
 4 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d78ab1b645c95..de2c314fb5d2d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,19 +50,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            os: ubuntu-20.04-4core-16gb
-            env: {}
-          - name: mingw-check-tidy
-            os: ubuntu-20.04-4core-16gb
-            env: {}
-          - name: x86_64-gnu-llvm-15
-            env:
-              ENABLE_GCC_CODEGEN: "1"
-            os: ubuntu-20.04-16core-64gb
-          - name: x86_64-gnu-tools
-            os: ubuntu-20.04-16core-64gb
-            env: {}
           - name: i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 8cb360d98f53b..d3ce0d2c5e9b0 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -328,20 +328,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            <<: *job-linux-4c
-
-          - name: mingw-check-tidy
-            <<: *job-linux-4c
-
-          - name: x86_64-gnu-llvm-15
-            env:
-              ENABLE_GCC_CODEGEN: "1"
-            <<: *job-linux-16c
-
-          - name: x86_64-gnu-tools
-            <<: *job-linux-16c
-          
           - name: i686-mingw
             env:
               RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index b66e8f056f061..ea6ce8ef427a1 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -52,7 +52,7 @@ if isWindows; then
         curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
         7z x -y mingw.7z > /dev/null
         ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
-        echo "CUSTOM MINGW PATH 1"
+        echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin"
     fi
     echo "MAJAHA 4: $(cygpath -w $(which git))"
     echo "MAJAHA 4: $(cygpath -w $(which python))"
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index d2802471f2e24..9fd5cf95d2613 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -6,7 +6,9 @@ set -euo pipefail
 IFS=$'\n\t'
 
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
-
+# should try to remove windows git from the path.
+# There are two different windows gits at C:\Program Files\Git\mingw64\bin\git.exe
+# and C:\Program Files\Git\bin\git.exe ?!
 if isWindows; then
     echo "MAJAHA PWD: $(pwd)"
     echo "MAJAHA 1: $(cygpath -w $(which git))"
@@ -31,7 +33,7 @@ if isWindows; then
         cp "${python_home}/python.exe" "${python_home}/python3.exe"
     fi
     echo "MAJAHA 1: $(cygpath -w $(which python))"
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts" # should try to remove windows git from the path.
+    #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
+    #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
     echo "MAJAHA 2: $(cygpath -w $(which python))"
 fi

From 6995865be8550969f931a370a0ef043364c51dff Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 006/168] TEMP CI 5

---
 src/ci/scripts/install-mingw.sh | 5 ++++-
 src/ci/scripts/install-msys2.sh | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index ea6ce8ef427a1..3bd3fb33c5324 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -13,6 +13,9 @@ MINGW_ARCHIVE_32="i686-12.2.0-release-posix-dwarf-rt_v10-rev0.7z"
 MINGW_ARCHIVE_64="x86_64-12.2.0-release-posix-seh-rt_v10-rev0.7z"
 
 if isWindows; then
+    echo "PATH: $PATH"
+    echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
+    echo "MSYSTEM: $MSYSTEM"
     echo "MAJAHA 3: $(cygpath -w $(which git))"
     echo "MAJAHA 3: $(cygpath -w $(which python))"
     case "${CI_JOB_NAME}" in
@@ -52,7 +55,7 @@ if isWindows; then
         curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
         7z x -y mingw.7z > /dev/null
         ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
-        echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin"
+        echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin"
     fi
     echo "MAJAHA 4: $(cygpath -w $(which git))"
     echo "MAJAHA 4: $(cygpath -w $(which python))"
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 9fd5cf95d2613..88a26cfbd10db 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -10,7 +10,9 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 # There are two different windows gits at C:\Program Files\Git\mingw64\bin\git.exe
 # and C:\Program Files\Git\bin\git.exe ?!
 if isWindows; then
-    echo "MAJAHA PWD: $(pwd)"
+    echo "PATH: $PATH"
+    echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
+    echo "MSYSTEM: $MSYSTEM"
     echo "MAJAHA 1: $(cygpath -w $(which git))"
     msys2Path="c:/msys64"
     mkdir -p "${msys2Path}/home/${USERNAME}"

From 61547cbc7e3c3821f6d57c16e2c91a8db410b88e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 007/168] TEMP CI 6

---
 src/ci/scripts/install-mingw.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 3bd3fb33c5324..b002c3d6bc734 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -55,7 +55,7 @@ if isWindows; then
         curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
         7z x -y mingw.7z > /dev/null
         ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
-        echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin"
+        echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
     fi
     echo "MAJAHA 4: $(cygpath -w $(which git))"
     echo "MAJAHA 4: $(cygpath -w $(which python))"

From 7d8df36e7ecb40a04b21328ae7881dc0b2eb54d7 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 008/168] TEMP CI 7

---
 src/ci/scripts/install-mingw.sh | 2 +-
 src/ci/scripts/install-msys2.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index b002c3d6bc734..5715f6b6ab9a3 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -15,7 +15,7 @@ MINGW_ARCHIVE_64="x86_64-12.2.0-release-posix-seh-rt_v10-rev0.7z"
 if isWindows; then
     echo "PATH: $PATH"
     echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
-    echo "MSYSTEM: $MSYSTEM"
+    echo "MSYSTEM: ${MSYSTEM-unset}"
     echo "MAJAHA 3: $(cygpath -w $(which git))"
     echo "MAJAHA 3: $(cygpath -w $(which python))"
     case "${CI_JOB_NAME}" in
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 88a26cfbd10db..a76694bc08aec 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -12,7 +12,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 if isWindows; then
     echo "PATH: $PATH"
     echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
-    echo "MSYSTEM: $MSYSTEM"
+    echo "MSYSTEM: ${MSYSTEM-unset}"
     echo "MAJAHA 1: $(cygpath -w $(which git))"
     msys2Path="c:/msys64"
     mkdir -p "${msys2Path}/home/${USERNAME}"

From bdef4f9f12e451f4008a827d943689ef28cd1e0e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 009/168] TEMP CI 8

---
 src/ci/scripts/install-mingw.sh | 3 ++-
 src/ci/scripts/install-msys2.sh | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 5715f6b6ab9a3..6df4c09f4dfde 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -52,11 +52,12 @@ if isWindows; then
     else
         mingw_dir="mingw${bits}"
 
-        curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
+        curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" # This doesn't seem to include python. Should install in msys2 step instead?
         7z x -y mingw.7z > /dev/null
         ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
         echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
     fi
     echo "MAJAHA 4: $(cygpath -w $(which git))"
     echo "MAJAHA 4: $(cygpath -w $(which python))"
+    echo "LS: $(ls)"
 fi
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index a76694bc08aec..e4e1b04e5335c 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -38,4 +38,5 @@ if isWindows; then
     #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
     #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
     echo "MAJAHA 2: $(cygpath -w $(which python))"
+    echo "LS: $(ls)"
 fi

From acab766367f0e73a22c037cf8769a1a465af9972 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 010/168] TEMP CI 9

---
 .github/workflows/ci.yml        | 4 ++--
 src/ci/github-actions/ci.yml    | 4 ++--
 src/ci/scripts/install-mingw.sh | 1 +
 src/ci/scripts/install-msys2.sh | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de2c314fb5d2d..22981cc0f36c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,14 +55,14 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
               SCRIPT: make ci-mingw
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 0
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
               SCRIPT: make ci-mingw
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 0
             os: windows-2019-8core-32gb
           - name: dist-i686-mingw
             env:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index d3ce0d2c5e9b0..a84130228f5fe 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -335,7 +335,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 0
             <<: *job-windows-8c
 
           - name: x86_64-mingw
@@ -347,7 +347,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 0
             <<: *job-windows-8c
           
           - name: dist-i686-mingw
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 6df4c09f4dfde..4d3f5d5216c7a 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -13,6 +13,7 @@ MINGW_ARCHIVE_32="i686-12.2.0-release-posix-dwarf-rt_v10-rev0.7z"
 MINGW_ARCHIVE_64="x86_64-12.2.0-release-posix-seh-rt_v10-rev0.7z"
 
 if isWindows; then
+    echo "Path of / : $(cygpath -w /)"
     echo "PATH: $PATH"
     echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
     echo "MSYSTEM: ${MSYSTEM-unset}"
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index e4e1b04e5335c..8593dffbc28f5 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -10,6 +10,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 # There are two different windows gits at C:\Program Files\Git\mingw64\bin\git.exe
 # and C:\Program Files\Git\bin\git.exe ?!
 if isWindows; then
+    echo "Path of / : $(cygpath -w /)"
     echo "PATH: $PATH"
     echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
     echo "MSYSTEM: ${MSYSTEM-unset}"

From 016e385c801a423ab64f664f603d06bd67209be7 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 011/168] TEMP CI 10

---
 src/ci/scripts/install-mingw.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 4d3f5d5216c7a..39471fbd13687 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -61,4 +61,5 @@ if isWindows; then
     echo "MAJAHA 4: $(cygpath -w $(which git))"
     echo "MAJAHA 4: $(cygpath -w $(which python))"
     echo "LS: $(ls)"
+    echo "PATH: $PATH"
 fi

From 0c223afc1d60514cd02afdbfcbdfe488e78f67d7 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 012/168] TEMP CI 11

---
 .github/workflows/ci.yml        | 4 ++--
 src/ci/github-actions/ci.yml    | 4 ++--
 src/ci/scripts/install-mingw.sh | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 22981cc0f36c5..74030de6e16c0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
               SCRIPT: python x.py dist bootstrap --include-default-paths
-              CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 0
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
@@ -77,7 +77,7 @@ jobs:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 0
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
     timeout-minutes: 600
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index a84130228f5fe..0e4f17874f416 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -360,7 +360,7 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               SCRIPT: python x.py dist bootstrap --include-default-paths
-              CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 0
               DIST_REQUIRE_ALL_TOOLS: 1
             <<: *job-windows-8c
 
@@ -374,7 +374,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 0
               DIST_REQUIRE_ALL_TOOLS: 1
             <<: *job-windows-8c
 
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 39471fbd13687..ff6006b17edea 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -49,7 +49,7 @@ if isWindows; then
             mingw-w64-$arch-gcc \
             mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
         ciCommandAddPath "$(ciCheckoutPath)/msys2/mingw${bits}/bin"
-        echo "CUSTOM MINGW PATH 0"
+        echo "CUSTOM MINGW PATH 0: $(ciCheckoutPath)/msys2/mingw${bits}/bin | $(cygpath -w "$(ciCheckoutPath)/msys2/mingw${bits}/bin")"
     else
         mingw_dir="mingw${bits}"
 
@@ -61,5 +61,4 @@ if isWindows; then
     echo "MAJAHA 4: $(cygpath -w $(which git))"
     echo "MAJAHA 4: $(cygpath -w $(which python))"
     echo "LS: $(ls)"
-    echo "PATH: $PATH"
 fi

From 71ae01bebeadaafd04f4822d8f5ff052e2bc56a0 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 013/168] TEMP CI 12

---
 src/ci/scripts/install-mingw.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index ff6006b17edea..70c8bef4b96ed 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -48,8 +48,8 @@ if isWindows; then
         pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
             mingw-w64-$arch-gcc \
             mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
-        ciCommandAddPath "$(ciCheckoutPath)/msys2/mingw${bits}/bin"
-        echo "CUSTOM MINGW PATH 0: $(ciCheckoutPath)/msys2/mingw${bits}/bin | $(cygpath -w "$(ciCheckoutPath)/msys2/mingw${bits}/bin")"
+        ciCommandAddPath "/msys64/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
+        echo "CUSTOM MINGW PATH 0: /msys64/mingw${bits}/bin | $(cygpath -w "/msys64/mingw${bits}/bin")"
     else
         mingw_dir="mingw${bits}"
 

From f58e4cb42f49c52fd3627d9e8e6a7aae6eabba8e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 014/168] TEMP CI 13

---
 src/ci/scripts/install-mingw.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 70c8bef4b96ed..281c8e7a0625b 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -48,8 +48,8 @@ if isWindows; then
         pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
             mingw-w64-$arch-gcc \
             mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
-        ciCommandAddPath "/msys64/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
-        echo "CUSTOM MINGW PATH 0: /msys64/mingw${bits}/bin | $(cygpath -w "/msys64/mingw${bits}/bin")"
+        ciCommandAddPath "/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
+        echo "CUSTOM MINGW PATH 0: /mingw${bits}/bin | $(cygpath -w "/mingw${bits}/bin")"
     else
         mingw_dir="mingw${bits}"
 

From fc3830613fecc7db1974b54a779fcf3fabb0f889 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 015/168] TEMP CI 14

---
 src/ci/scripts/install-mingw.sh | 5 +++++
 src/ci/scripts/install-msys2.sh | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 281c8e7a0625b..27be2b77d3dd2 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -19,6 +19,8 @@ if isWindows; then
     echo "MSYSTEM: ${MSYSTEM-unset}"
     echo "MAJAHA 3: $(cygpath -w $(which git))"
     echo "MAJAHA 3: $(cygpath -w $(which python))"
+    echo "GITHUB_PATH: $GITHUB_PATH"
+    cat "$GITHUB_PATH"
     case "${CI_JOB_NAME}" in
         *i686*)
             bits=32
@@ -45,6 +47,7 @@ if isWindows; then
     esac
 
     if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
+        pacman -Syu --noconfirm
         pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
             mingw-w64-$arch-gcc \
             mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
@@ -61,4 +64,6 @@ if isWindows; then
     echo "MAJAHA 4: $(cygpath -w $(which git))"
     echo "MAJAHA 4: $(cygpath -w $(which python))"
     echo "LS: $(ls)"
+    echo "GITHUB_PATH: $GITHUB_PATH"
+    cat "$GITHUB_PATH"
 fi
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 8593dffbc28f5..62beac1bc21c4 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -19,6 +19,8 @@ if isWindows; then
     mkdir -p "${msys2Path}/home/${USERNAME}"
     ciCommandAddPath "${msys2Path}/usr/bin" # This is what rotates the CI shell from Git bash to msys bash i think
     echo "MAJAHA 2: $(cygpath -w $(which git))"
+    echo "GITHUB_PATH: $GITHUB_PATH"
+    cat "$GITHUB_PATH"
 
     # Detect the native Python version installed on the agent. On GitHub
     # Actions, the C:\hostedtoolcache\windows\Python directory contains a
@@ -36,8 +38,10 @@ if isWindows; then
         cp "${python_home}/python.exe" "${python_home}/python3.exe"
     fi
     echo "MAJAHA 1: $(cygpath -w $(which python))"
-    #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
+    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
     #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
     echo "MAJAHA 2: $(cygpath -w $(which python))"
     echo "LS: $(ls)"
+    echo "GITHUB_PATH: $GITHUB_PATH"
+    cat "$GITHUB_PATH"
 fi

From 41c72e8d36d7416846955461db5113e1acd39f28 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 016/168] TEMP CI 15

---
 src/ci/scripts/install-msys2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 62beac1bc21c4..6cd60ae9a2a96 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -38,7 +38,7 @@ if isWindows; then
         cp "${python_home}/python.exe" "${python_home}/python3.exe"
     fi
     echo "MAJAHA 1: $(cygpath -w $(which python))"
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
+    #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
     #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
     echo "MAJAHA 2: $(cygpath -w $(which python))"
     echo "LS: $(ls)"

From 124e9fe3e0433c47a74fc563e1e5018591abb511 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 017/168] TEMP CI 16

---
 src/ci/scripts/install-mingw.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 27be2b77d3dd2..7457b3a915399 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -47,12 +47,16 @@ if isWindows; then
     esac
 
     if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
+        echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
+        pacman -Qg mingw-w64-x86_64-toolchain
         pacman -Syu --noconfirm
         pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
             mingw-w64-$arch-gcc \
             mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
         ciCommandAddPath "/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
         echo "CUSTOM MINGW PATH 0: /mingw${bits}/bin | $(cygpath -w "/mingw${bits}/bin")"
+        echo "2pacman -Qg mingw-w64-x86_64-toolchain:"
+        pacman -Qg mingw-w64-x86_64-toolchain
     else
         mingw_dir="mingw${bits}"
 

From dbaa0ea16fb29e2f5ecefb71c58c4f2e71ff8655 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 018/168] TEMP CI 17

---
 src/ci/scripts/install-mingw.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 7457b3a915399..5f8a8e9a260c6 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -70,4 +70,9 @@ if isWindows; then
     echo "LS: $(ls)"
     echo "GITHUB_PATH: $GITHUB_PATH"
     cat "$GITHUB_PATH"
+    echo "MAJAHA /etc/pacman.conf"
+    cat /etc/pacman.conf
+    echo "\n"
+    echo "MAJAHA /etc/pacman.d/mirrorlist.mingw64"
+    cat /etc/pacman.d/mirrorlist.mingw64
 fi

From e930638c94e83b8901acc938ae583a762956f477 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 019/168] TEMP CI 18

---
 .github/workflows/ci.yml     | 1 +
 src/ci/github-actions/ci.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74030de6e16c0..b2826a2d0efcb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,7 @@ jobs:
     if: "github.event_name == 'pull_request'"
     continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: i686-mingw
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 0e4f17874f416..187256fdb290e 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -326,6 +326,7 @@ jobs:
     if: github.event_name == 'pull_request'
     continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: i686-mingw

From ec4210ff492ed189517145564f46920f516c0b8a Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 020/168] TEMP CI 19

---
 .github/workflows/ci.yml        | 3 +++
 src/ci/github-actions/ci.yml    | 3 +++
 src/ci/scripts/install-mingw.sh | 2 +-
 src/ci/scripts/install-msys2.sh | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b2826a2d0efcb..adad1b03cb1be 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,6 +47,9 @@ jobs:
       CACHE_DOMAIN: ci-caches.rust-lang.org
     if: "github.event_name == 'pull_request'"
     continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
+    defaults:
+      run:
+        shell: msys2bash.cmd
     strategy:
       fail-fast: false
       matrix:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 187256fdb290e..d667a71e18bec 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -325,6 +325,9 @@ jobs:
       PR_CI_JOB: 1
     if: github.event_name == 'pull_request'
     continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
+    defaults:
+      run:
+        shell: msys2bash.cmd
     strategy:
       fail-fast: false
       matrix:
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 5f8a8e9a260c6..31c25f8453d7d 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -53,7 +53,7 @@ if isWindows; then
         pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
             mingw-w64-$arch-gcc \
             mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
-        ciCommandAddPath "/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
+        #ciCommandAddPath "/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
         echo "CUSTOM MINGW PATH 0: /mingw${bits}/bin | $(cygpath -w "/mingw${bits}/bin")"
         echo "2pacman -Qg mingw-w64-x86_64-toolchain:"
         pacman -Qg mingw-w64-x86_64-toolchain
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 6cd60ae9a2a96..64f8b58c3fc6a 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -17,7 +17,7 @@ if isWindows; then
     echo "MAJAHA 1: $(cygpath -w $(which git))"
     msys2Path="c:/msys64"
     mkdir -p "${msys2Path}/home/${USERNAME}"
-    ciCommandAddPath "${msys2Path}/usr/bin" # This is what rotates the CI shell from Git bash to msys bash i think
+    #ciCommandAddPath "${msys2Path}/usr/bin" # This is what rotates the CI shell from Git bash to msys bash i think
     echo "MAJAHA 2: $(cygpath -w $(which git))"
     echo "GITHUB_PATH: $GITHUB_PATH"
     cat "$GITHUB_PATH"

From 65895c4d6737d4703e484791c385a1dbdf6cd351 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 021/168] TEMP CI 20

---
 .github/workflows/ci.yml     | 2 +-
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index adad1b03cb1be..b236dd34a555d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
     continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
     defaults:
       run:
-        shell: msys2bash.cmd
+        shell: "C:\\msys64\\usr\\bin\\bash.exe -eo pipefail {0}"
     strategy:
       fail-fast: false
       matrix:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index d667a71e18bec..07056491c695a 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -327,7 +327,7 @@ jobs:
     continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
     defaults:
       run:
-        shell: msys2bash.cmd
+        shell: C:\msys64\usr\bin\bash.exe -eo pipefail {0} # specifically include /etc/profile
     strategy:
       fail-fast: false
       matrix:

From 00a411bc4d2e7280bfed728afed51982bc122ace Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 022/168] TEMP CI 21

---
 src/ci/scripts/disable-git-crlf-conversion.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ci/scripts/disable-git-crlf-conversion.sh b/src/ci/scripts/disable-git-crlf-conversion.sh
index 6de080a9fde00..aa2ec4358ff5a 100755
--- a/src/ci/scripts/disable-git-crlf-conversion.sh
+++ b/src/ci/scripts/disable-git-crlf-conversion.sh
@@ -10,4 +10,6 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+ls /home
+
 git config --replace-all --global core.autocrlf false

From 8dba931f9483a990fadee6ab03817196b3ceb4c4 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 023/168] TEMP CI 22

---
 src/ci/scripts/disable-git-crlf-conversion.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/scripts/disable-git-crlf-conversion.sh b/src/ci/scripts/disable-git-crlf-conversion.sh
index aa2ec4358ff5a..6bdf52a0d0b8d 100755
--- a/src/ci/scripts/disable-git-crlf-conversion.sh
+++ b/src/ci/scripts/disable-git-crlf-conversion.sh
@@ -10,6 +10,6 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-ls /home
+mkdir /home/runneradmin
 
 git config --replace-all --global core.autocrlf false

From 2d2448abfc7fcf886101f781b3113ab82b38943d Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 024/168] TEMP CI 23

---
 src/ci/scripts/disable-git-crlf-conversion.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ci/scripts/disable-git-crlf-conversion.sh b/src/ci/scripts/disable-git-crlf-conversion.sh
index 6bdf52a0d0b8d..7ebe97779c913 100755
--- a/src/ci/scripts/disable-git-crlf-conversion.sh
+++ b/src/ci/scripts/disable-git-crlf-conversion.sh
@@ -10,6 +10,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+echo MAJAHA
 mkdir /home/runneradmin
+ls /home/
 
 git config --replace-all --global core.autocrlf false

From ec4683fe6402bb23e85a0bb1c80e11a6c3b319f2 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 025/168] TEMP CI 24

---
 .github/workflows/ci.yml                      | 6 +++---
 src/ci/github-actions/ci.yml                  | 2 +-
 src/ci/scripts/disable-git-crlf-conversion.sh | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b236dd34a555d..8c002aded67ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,7 +88,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     steps:
       - name: disable git crlf conversion
-        run: git config --global core.autocrlf false
+        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -481,7 +481,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     steps:
       - name: disable git crlf conversion
-        run: git config --global core.autocrlf false
+        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -608,7 +608,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     steps:
       - name: disable git crlf conversion
-        run: git config --global core.autocrlf false
+        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 07056491c695a..52385784b0f2e 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -115,7 +115,7 @@ x--expand-yaml-anchors--remove:
     env: *shared-ci-variables
     steps:
       - name: disable git crlf conversion
-        run: git config --global core.autocrlf false
+        run: src/ci/scripts/disable-git-crlf-conversion.sh
 
       - name: checkout the source code
         uses: actions/checkout@v4
diff --git a/src/ci/scripts/disable-git-crlf-conversion.sh b/src/ci/scripts/disable-git-crlf-conversion.sh
index 7ebe97779c913..df3912585e916 100755
--- a/src/ci/scripts/disable-git-crlf-conversion.sh
+++ b/src/ci/scripts/disable-git-crlf-conversion.sh
@@ -11,6 +11,7 @@ set -euo pipefail
 IFS=$'\n\t'
 
 echo MAJAHA
+ls /home/
 mkdir /home/runneradmin
 ls /home/
 

From 8b851b8b1be5e24c8937eba153ef349f5f05ae36 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 026/168] TEMP CI 25

---
 .github/workflows/ci.yml     | 6 ------
 src/ci/github-actions/ci.yml | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c002aded67ea..5edd56480f533 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,8 +87,6 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - name: disable git crlf conversion
-        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -480,8 +478,6 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - name: disable git crlf conversion
-        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -607,8 +603,6 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - name: disable git crlf conversion
-        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 52385784b0f2e..02695355c7f69 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -114,8 +114,8 @@ x--expand-yaml-anchors--remove:
     runs-on: "${{ matrix.os }}"
     env: *shared-ci-variables
     steps:
-      - name: disable git crlf conversion
-        run: src/ci/scripts/disable-git-crlf-conversion.sh
+      # - name: disable git crlf conversion
+      #   run: src/ci/scripts/disable-git-crlf-conversion.sh
 
       - name: checkout the source code
         uses: actions/checkout@v4

From 893d58bae0966e94bf59feee346a491ec6d8b7a1 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 027/168] TEMP CI 26

---
 src/ci/scripts/disable-git-crlf-conversion.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ci/scripts/disable-git-crlf-conversion.sh b/src/ci/scripts/disable-git-crlf-conversion.sh
index df3912585e916..2e8422d583fe9 100755
--- a/src/ci/scripts/disable-git-crlf-conversion.sh
+++ b/src/ci/scripts/disable-git-crlf-conversion.sh
@@ -11,8 +11,10 @@ set -euo pipefail
 IFS=$'\n\t'
 
 echo MAJAHA
-ls /home/
-mkdir /home/runneradmin
-ls /home/
+cygpath -w /
+echo MAJAHA2
+ls /
+# mkdir /home/runneradmin
+# ls /home/
 
 git config --replace-all --global core.autocrlf false

From c2944545559eb9f6f0c0045cf88fd07bbdc0537d Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 12 Nov 2023 11:45:05 +0000
Subject: [PATCH 028/168] TEMP CI 27

---
 src/ci/scripts/disable-git-crlf-conversion.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ci/scripts/disable-git-crlf-conversion.sh b/src/ci/scripts/disable-git-crlf-conversion.sh
index 2e8422d583fe9..21e7dd2ec8e4a 100755
--- a/src/ci/scripts/disable-git-crlf-conversion.sh
+++ b/src/ci/scripts/disable-git-crlf-conversion.sh
@@ -11,6 +11,8 @@ set -euo pipefail
 IFS=$'\n\t'
 
 echo MAJAHA
+which which
+which cygpath
 cygpath -w /
 echo MAJAHA2
 ls /

From 105f6d0d29cf59e4ac8ca371941406cb0cebc596 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 15 Nov 2023 15:18:08 +0000
Subject: [PATCH 029/168] TEMP CI 28

---
 .github/workflows/ci.yml     | 2 +-
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5edd56480f533..cd9808d040adc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
     continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
     defaults:
       run:
-        shell: "C:\\msys64\\usr\\bin\\bash.exe -eo pipefail {0}"
+        shell: "C:\\msys64\\msys2_shell.cmd -mingw64 -here -eo pipefail {0}"
     strategy:
       fail-fast: false
       matrix:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 02695355c7f69..bd756f6a89e6e 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -327,7 +327,7 @@ jobs:
     continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
     defaults:
       run:
-        shell: C:\msys64\usr\bin\bash.exe -eo pipefail {0} # specifically include /etc/profile
+        shell: C:\msys64\msys2_shell.cmd -mingw64 -here -eo pipefail {0}
     strategy:
       fail-fast: false
       matrix:

From d8dd37744ec20f5c949b3494362a12e814270264 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 15 Nov 2023 20:43:41 +0000
Subject: [PATCH 030/168] TEMP CI 29

---
 .github/workflows/ci.yml     | 15 +++++++++++++++
 src/ci/github-actions/ci.yml | 10 +++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd9808d040adc..0358c70aef07e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,6 +91,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
       - name: configure the PR in which the error message will be posted
         run: "echo \"[CI_PR_NUMBER=$num]\""
         env:
@@ -482,6 +487,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
       - name: configure the PR in which the error message will be posted
         run: "echo \"[CI_PR_NUMBER=$num]\""
         env:
@@ -607,6 +617,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
       - name: configure the PR in which the error message will be posted
         run: "echo \"[CI_PR_NUMBER=$num]\""
         env:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index bd756f6a89e6e..3a8fac9651e65 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -121,7 +121,15 @@ x--expand-yaml-anchors--remove:
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
-
+      
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: >
+            git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-python
+      
       # Rust Log Analyzer can't currently detect the PR number of a GitHub
       # Actions build on its own, so a hint in the log message is needed to
       # point it in the right direction.

From b2b322f7aebc63c6a22335141b2451ad34544994 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 15 Nov 2023 21:22:44 +0000
Subject: [PATCH 031/168] TEMP CI 30

---
 .github/workflows/ci.yml     | 12 +++++++++---
 src/ci/github-actions/ci.yml |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0358c70aef07e..65d937fd61354 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,9 +47,6 @@ jobs:
       CACHE_DOMAIN: ci-caches.rust-lang.org
     if: "github.event_name == 'pull_request'"
     continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
-    defaults:
-      run:
-        shell: "C:\\msys64\\msys2_shell.cmd -mingw64 -here -eo pipefail {0}"
     strategy:
       fail-fast: false
       matrix:
@@ -84,6 +81,9 @@ jobs:
               CUSTOM_MINGW: 0
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
+    defaults:
+      run:
+        shell: "mysys2 {0}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -480,6 +480,9 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
             os: windows-2019-8core-32gb
+    defaults:
+      run:
+        shell: "mysys2 {0}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -610,6 +613,9 @@ jobs:
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
+    defaults:
+      run:
+        shell: "mysys2 {0}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 3a8fac9651e65..bb183562cbb2b 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -110,6 +110,9 @@ x--expand-yaml-anchors--remove:
     if: success() && !env.SKIP_JOB
 
   - &base-ci-job
+    defaults:
+      run:
+        shell: mysys2 {0}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env: *shared-ci-variables
@@ -333,9 +336,6 @@ jobs:
       PR_CI_JOB: 1
     if: github.event_name == 'pull_request'
     continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
-    defaults:
-      run:
-        shell: C:\msys64\msys2_shell.cmd -mingw64 -here -eo pipefail {0}
     strategy:
       fail-fast: false
       matrix:

From 2fb85f73e7c0a842529d409ff3d19066890641e7 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 13:26:37 +0000
Subject: [PATCH 032/168] TEMP CI 31

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65d937fd61354..a1cdeb7b09002 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,7 +83,7 @@ jobs:
             os: windows-2019-8core-32gb
     defaults:
       run:
-        shell: "mysys2 {0}"
+        shell: "msys2 {0}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -482,7 +482,7 @@ jobs:
             os: windows-2019-8core-32gb
     defaults:
       run:
-        shell: "mysys2 {0}"
+        shell: "msys2 {0}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -615,7 +615,7 @@ jobs:
             os: ubuntu-20.04-16core-64gb
     defaults:
       run:
-        shell: "mysys2 {0}"
+        shell: "msys2 {0}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index bb183562cbb2b..48b03ad1866f8 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -112,7 +112,7 @@ x--expand-yaml-anchors--remove:
   - &base-ci-job
     defaults:
       run:
-        shell: mysys2 {0}
+        shell: msys2 {0}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env: *shared-ci-variables

From 4cd175c47cd4357a44c0ff9ac7b6f1bb58a1d838 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 14:14:07 +0000
Subject: [PATCH 033/168] TEMP CI 32

---
 .github/workflows/ci.yml     | 30 +++++++++++++++---------------
 src/ci/github-actions/ci.yml | 16 ++++++++--------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1cdeb7b09002..73407303b78b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,15 +87,15 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - name: checkout the source code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-jq\n"
+      - name: checkout the source code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
       - name: configure the PR in which the error message will be posted
         run: "echo \"[CI_PR_NUMBER=$num]\""
         env:
@@ -486,15 +486,15 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - name: checkout the source code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-jq\n"
+      - name: checkout the source code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
       - name: configure the PR in which the error message will be posted
         run: "echo \"[CI_PR_NUMBER=$num]\""
         env:
@@ -619,15 +619,15 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - name: checkout the source code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-jq\n"
+      - name: checkout the source code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
       - name: configure the PR in which the error message will be posted
         run: "echo \"[CI_PR_NUMBER=$num]\""
         env:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 48b03ad1866f8..dc99c8d8a1b33 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -117,6 +117,14 @@ x--expand-yaml-anchors--remove:
     runs-on: "${{ matrix.os }}"
     env: *shared-ci-variables
     steps:
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: >
+            git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-python mingw-w64-jq
+      
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh
 
@@ -125,14 +133,6 @@ x--expand-yaml-anchors--remove:
         with:
           fetch-depth: 2
       
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          install: >
-            git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-python
-      
       # Rust Log Analyzer can't currently detect the PR number of a GitHub
       # Actions build on its own, so a hint in the log message is needed to
       # point it in the right direction.

From dfdcb5c1c46dc008a1b4896c47d02b16ae469bf4 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 14:39:29 +0000
Subject: [PATCH 034/168] TEMP CI 32

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73407303b78b3..f1681e44f42a1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-jq\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-jq\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -623,7 +623,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-jq\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index dc99c8d8a1b33..a7cbf1e1d9f4f 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -123,7 +123,7 @@ x--expand-yaml-anchors--remove:
           update: true
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-python mingw-w64-jq
+            mingw-w64-x86_64-python mingw-w64-x86_64-jq
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From 0ae0b418024de7391530375ce627ed24c7b68bd8 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 15:30:05 +0000
Subject: [PATCH 035/168] TEMP CI 33

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1681e44f42a1..6b6074e8b6760 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -623,7 +623,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index a7cbf1e1d9f4f..414e15cb03510 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -124,6 +124,7 @@ x--expand-yaml-anchors--remove:
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
             mingw-w64-x86_64-python mingw-w64-x86_64-jq
+            mingw-w64-x86_64-7zip
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From 31bd8d6c96d949f906bca66ed9dcd140a22ad029 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 17:50:03 +0000
Subject: [PATCH 036/168] TEMP CI 34

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6b6074e8b6760..78efaca3decef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -623,7 +623,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 414e15cb03510..919875eb664a3 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -124,7 +124,7 @@ x--expand-yaml-anchors--remove:
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
             mingw-w64-x86_64-python mingw-w64-x86_64-jq
-            mingw-w64-x86_64-7zip
+            mingw-w64-x86_64-7zip dos2unix
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From f6749f86574915d2e5fb8c309100141f7a5fd365 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 18:29:38 +0000
Subject: [PATCH 037/168] TEMP CI 35

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78efaca3decef..f7c9ec675e82e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -623,7 +623,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 919875eb664a3..c75743321cd88 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -124,7 +124,7 @@ x--expand-yaml-anchors--remove:
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
             mingw-w64-x86_64-python mingw-w64-x86_64-jq
-            mingw-w64-x86_64-7zip dos2unix
+            mingw-w64-x86_64-7zip dos2unix make
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From 2b360df88f255ee293010df15af9dc81597c40d5 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 19:06:51 +0000
Subject: [PATCH 038/168] TEMP CI 36

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7c9ec675e82e..a06ef42273069 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -623,7 +623,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index c75743321cd88..824ce2e50b1c4 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -125,6 +125,7 @@ x--expand-yaml-anchors--remove:
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
             mingw-w64-x86_64-python mingw-w64-x86_64-jq
             mingw-w64-x86_64-7zip dos2unix make
+            mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From 6495ab4a566e467ed27966dce484f0cdbf6f54d6 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 20:27:01 +0000
Subject: [PATCH 039/168] TEMP CI 37

---
 .github/workflows/ci.yml     |  6 +++---
 src/ci/github-actions/ci.yml | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a06ef42273069..899ecc4e186b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python # mingw-w64-x86_64-jq # mingw-w64-x86_64-7zip dos2unix make # mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python # mingw-w64-x86_64-jq # mingw-w64-x86_64-7zip dos2unix make # mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -623,7 +623,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python # mingw-w64-x86_64-jq # mingw-w64-x86_64-7zip dos2unix make # mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 824ce2e50b1c4..d03bb96a52b4c 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -115,7 +115,9 @@ x--expand-yaml-anchors--remove:
         shell: msys2 {0}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
-    env: *shared-ci-variables
+    env:
+      <<: *shared-ci-variables
+      MSYS2_PATH_TYPE: inherit
     steps:
       - uses: msys2/setup-msys2@v2
         with:
@@ -123,9 +125,9 @@ x--expand-yaml-anchors--remove:
           update: true
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-python mingw-w64-x86_64-jq
-            mingw-w64-x86_64-7zip dos2unix make
-            mingw-w64-x86_64-sccache
+            mingw-w64-x86_64-python # mingw-w64-x86_64-jq
+            # mingw-w64-x86_64-7zip dos2unix make
+            # mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From 63f54e71e28f0b656ef3ca86701243a9384bc345 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 22:11:09 +0000
Subject: [PATCH 040/168] TEMP CI 38

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 899ecc4e186b0..73c5a4bf299b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python # mingw-w64-x86_64-jq # mingw-w64-x86_64-7zip dos2unix make # mingw-w64-x86_64-sccache\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python # mingw-w64-x86_64-jq # mingw-w64-x86_64-7zip dos2unix make # mingw-w64-x86_64-sccache\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -623,7 +623,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python # mingw-w64-x86_64-jq # mingw-w64-x86_64-7zip dos2unix make # mingw-w64-x86_64-sccache\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index d03bb96a52b4c..6d26bf50dcb40 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -125,9 +125,11 @@ x--expand-yaml-anchors--remove:
           update: true
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-python # mingw-w64-x86_64-jq
-            # mingw-w64-x86_64-7zip dos2unix make
-            # mingw-w64-x86_64-sccache
+            mingw-w64-x86_64-python
+          
+          # mingw-w64-x86_64-jq
+          # mingw-w64-x86_64-7zip dos2unix make
+          # mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From aa1bc92b9ebdb93c5351473ab7e11a9befad31a4 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 17 Nov 2023 22:32:37 +0000
Subject: [PATCH 041/168] TEMP CI 38

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73c5a4bf299b1..a06ef42273069 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -623,7 +623,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 6d26bf50dcb40..cf934158a076f 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -126,10 +126,9 @@ x--expand-yaml-anchors--remove:
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
             mingw-w64-x86_64-python
-          
-          # mingw-w64-x86_64-jq
-          # mingw-w64-x86_64-7zip dos2unix make
-          # mingw-w64-x86_64-sccache
+            mingw-w64-x86_64-jq
+            mingw-w64-x86_64-7zip dos2unix make
+            mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From 47482d1528624392c16238b1b1410ac04ce6a78e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 18 Nov 2023 10:01:40 +0000
Subject: [PATCH 042/168] TEMP CI 39

---
 .github/workflows/ci.yml     | 3 +++
 src/ci/github-actions/ci.yml | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a06ef42273069..e69fa2e99fed4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,6 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
+          path-type: inherit
           install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
@@ -490,6 +491,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
+          path-type: inherit
           install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
@@ -623,6 +625,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
+          path-type: inherit
           install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index cf934158a076f..98b0b6ceb19dd 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -117,12 +117,13 @@ x--expand-yaml-anchors--remove:
     runs-on: "${{ matrix.os }}"
     env:
       <<: *shared-ci-variables
-      MSYS2_PATH_TYPE: inherit
+      #MSYS2_PATH_TYPE: inherit
     steps:
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: true
+          path-type: inherit
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
             mingw-w64-x86_64-python

From f1e6d3c5059c6495780eb87ffa2b05a6177ceb29 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 18 Nov 2023 10:25:23 +0000
Subject: [PATCH 043/168] TEMP CI 40

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e69fa2e99fed4..07f28a45aa5e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip dos2unix make mingw-w64-x86_64-sccache\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 98b0b6ceb19dd..754bb19b24972 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -127,9 +127,9 @@ x--expand-yaml-anchors--remove:
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
             mingw-w64-x86_64-python
-            mingw-w64-x86_64-jq
-            mingw-w64-x86_64-7zip dos2unix make
-            mingw-w64-x86_64-sccache
+          #mingw-w64-x86_64-7zip dos2unix make
+          #mingw-w64-x86_64-sccache
+          #mingw-w64-x86_64-jq
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From 073a35b91212bcfaf578e4a557e4301b362c3ffb Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 18 Nov 2023 10:58:34 +0000
Subject: [PATCH 044/168] TEMP CI 41

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 07f28a45aa5e3..773aa0ddee972 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-python\n"
+          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 754bb19b24972..234c745317f6e 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -126,7 +126,7 @@ x--expand-yaml-anchors--remove:
           path-type: inherit
           install: >
             git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-python
+          #mingw-w64-x86_64-python
           #mingw-w64-x86_64-7zip dos2unix make
           #mingw-w64-x86_64-sccache
           #mingw-w64-x86_64-jq

From 0736e7feb69d8f76cb38c34945302d0927547873 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 18 Nov 2023 11:20:08 +0000
Subject: [PATCH 045/168] TEMP CI 42

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 773aa0ddee972..4b197014d3f0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
+          install: "git mingw-w64-x86_64-toolchain\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
+          install: "git mingw-w64-x86_64-toolchain\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
+          install: "git mingw-w64-x86_64-toolchain\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 234c745317f6e..912ada1d31b4d 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -125,7 +125,8 @@ x--expand-yaml-anchors--remove:
           update: true
           path-type: inherit
           install: >
-            git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake
+            git mingw-w64-x86_64-toolchain
+          #mingw-w64-x86_64-cmake
           #mingw-w64-x86_64-python
           #mingw-w64-x86_64-7zip dos2unix make
           #mingw-w64-x86_64-sccache

From eba4342a48a91c6bac8bab2a255cfab37f539b3e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 18 Nov 2023 11:42:36 +0000
Subject: [PATCH 046/168] TEMP CI 43

---
 .github/workflows/ci.yml     | 8 ++++----
 src/ci/github-actions/ci.yml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b197014d3f0d..ce228d24f2c81 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,21 +56,21 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
               SCRIPT: make ci-mingw
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 0
+              CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
               SCRIPT: make ci-mingw
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 0
+              CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
           - name: dist-i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
               SCRIPT: python x.py dist bootstrap --include-default-paths
-              CUSTOM_MINGW: 0
+              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
@@ -78,7 +78,7 @@ jobs:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 0
+              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
     defaults:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 912ada1d31b4d..7c151f7fe1251 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -354,7 +354,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 0
+              CUSTOM_MINGW: 1
             <<: *job-windows-8c
 
           - name: x86_64-mingw
@@ -366,7 +366,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 0
+              CUSTOM_MINGW: 1
             <<: *job-windows-8c
           
           - name: dist-i686-mingw
@@ -379,7 +379,7 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               SCRIPT: python x.py dist bootstrap --include-default-paths
-              CUSTOM_MINGW: 0
+              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             <<: *job-windows-8c
 
@@ -393,7 +393,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 0
+              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             <<: *job-windows-8c
 

From 416c98b8213d7f37f1f3ee993dc86f6ddb58203f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 18 Nov 2023 13:38:57 +0000
Subject: [PATCH 047/168] TEMP CI 44

---
 .github/workflows/ci.yml     | 3 ---
 src/ci/github-actions/ci.yml | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce228d24f2c81..04152a8f8dde6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,6 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +491,6 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +624,6 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "git mingw-w64-x86_64-toolchain\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 7c151f7fe1251..086cc06b6823c 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -124,8 +124,8 @@ x--expand-yaml-anchors--remove:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: >
-            git mingw-w64-x86_64-toolchain
+          #install: >
+          #git mingw-w64-x86_64-toolchain
           #mingw-w64-x86_64-cmake
           #mingw-w64-x86_64-python
           #mingw-w64-x86_64-7zip dos2unix make

From 7b85c780e715fd0e76ff3299292e2064d1974a37 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 18 Nov 2023 21:33:26 +0000
Subject: [PATCH 048/168] TEMP CI 45

---
 .github/workflows/ci.yml     | 3 +++
 src/ci/github-actions/ci.yml | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 04152a8f8dde6..888e52c8958f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,6 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
+          install: "make\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -491,6 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
+          install: "make\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -624,6 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
+          install: "make\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 086cc06b6823c..6b59594016f9c 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -124,11 +124,12 @@ x--expand-yaml-anchors--remove:
           msystem: MINGW64
           update: true
           path-type: inherit
-          #install: >
+          install: >
+            make
           #git mingw-w64-x86_64-toolchain
           #mingw-w64-x86_64-cmake
           #mingw-w64-x86_64-python
-          #mingw-w64-x86_64-7zip dos2unix make
+          #mingw-w64-x86_64-7zip dos2unix
           #mingw-w64-x86_64-sccache
           #mingw-w64-x86_64-jq
       

From edb37d9fa08224b8f49869dd5fdf7c98924e5f78 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 19 Nov 2023 13:57:28 +0000
Subject: [PATCH 049/168] TEMP CI 46

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 888e52c8958f0..cf0cc93a7c156 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make\n"
+          install: "make mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make\n"
+          install: "make mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make\n"
+          install: "make mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 6b59594016f9c..e02f0949d353d 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -126,9 +126,9 @@ x--expand-yaml-anchors--remove:
           path-type: inherit
           install: >
             make
+            mingw-w64-x86_64-python
           #git mingw-w64-x86_64-toolchain
           #mingw-w64-x86_64-cmake
-          #mingw-w64-x86_64-python
           #mingw-w64-x86_64-7zip dos2unix
           #mingw-w64-x86_64-sccache
           #mingw-w64-x86_64-jq

From e04fdb5b2bbc1f0840e1a602eebc73f98d819b90 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 050/168] TEMP CI 47

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf0cc93a7c156..c1f13bdb0d051 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          path-type: inherit
+          path-type: strict
           install: "make mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
@@ -491,7 +491,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          path-type: inherit
+          path-type: strict
           install: "make mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
@@ -625,7 +625,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          path-type: inherit
+          path-type: strict
           install: "make mingw-w64-x86_64-python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index e02f0949d353d..11886f47aa388 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -123,7 +123,7 @@ x--expand-yaml-anchors--remove:
         with:
           msystem: MINGW64
           update: true
-          path-type: inherit
+          path-type: strict # Prevents inheriting any environment variables into msys2
           install: >
             make
             mingw-w64-x86_64-python

From 47a65aaf5895862c36d01320c40d22fcc86ee881 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 051/168] TEMP CI 48

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a41caa813a3e7..6e193f4a0e928 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-jq\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-jq\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-jq\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index f9e9c2ead0b56..dcbf00b12aa76 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -127,6 +127,7 @@ x--expand-yaml-anchors--remove:
           install: >
             make
             mingw-w64-x86_64-python
+            mingw-w64-jq
           #git mingw-w64-x86_64-toolchain
           #mingw-w64-x86_64-cmake
           #mingw-w64-x86_64-7zip dos2unix

From bcdabaf773982e613d487e904172e5371108c82c Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 052/168] TEMP CI 49

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e193f4a0e928..299f0eb051478 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-jq\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-jq\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-jq\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index dcbf00b12aa76..ecb49746131ea 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -127,12 +127,11 @@ x--expand-yaml-anchors--remove:
           install: >
             make
             mingw-w64-x86_64-python
-            mingw-w64-jq
+            mingw-w64-x86_64-jq
           #git mingw-w64-x86_64-toolchain
           #mingw-w64-x86_64-cmake
           #mingw-w64-x86_64-7zip dos2unix
           #mingw-w64-x86_64-sccache
-          #mingw-w64-x86_64-jq
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From f62a9213738dbdabf1c6001558e5b96a8cb5a321 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 053/168] TEMP CI 50

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 299f0eb051478..f88f765b78c20 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index ecb49746131ea..4f40c0b4b028f 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -128,9 +128,10 @@ x--expand-yaml-anchors--remove:
             make
             mingw-w64-x86_64-python
             mingw-w64-x86_64-jq
+            mingw-w64-x86_64-7zip
           #git mingw-w64-x86_64-toolchain
           #mingw-w64-x86_64-cmake
-          #mingw-w64-x86_64-7zip dos2unix
+          #dos2unix
           #mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion

From 21b1750ea35246fece1f0b0b3537158352ebdccf Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 054/168] TEMP CI 51

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f88f765b78c20..2cf5dc187fe58 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 4f40c0b4b028f..3a01114216fc1 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -129,7 +129,8 @@ x--expand-yaml-anchors--remove:
             mingw-w64-x86_64-python
             mingw-w64-x86_64-jq
             mingw-w64-x86_64-7zip
-          #git mingw-w64-x86_64-toolchain
+            git
+          #mingw-w64-x86_64-toolchain
           #mingw-w64-x86_64-cmake
           #dos2unix
           #mingw-w64-x86_64-sccache

From 317ed3a2d3d05f989ca1428b2878557546e5067f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 055/168] TEMP CI 52

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2cf5dc187fe58..716500d327b50 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 3a01114216fc1..f672c2303c4c2 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -130,9 +130,9 @@ x--expand-yaml-anchors--remove:
             mingw-w64-x86_64-jq
             mingw-w64-x86_64-7zip
             git
+            dos2unix
           #mingw-w64-x86_64-toolchain
           #mingw-w64-x86_64-cmake
-          #dos2unix
           #mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion

From b09440fe3b62ca2f86d5ae6defaecf9cdf23871e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 056/168] TEMP CI 53

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 716500d327b50..8e0edc789c2f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index f672c2303c4c2..aab08195bfb2a 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -131,7 +131,7 @@ x--expand-yaml-anchors--remove:
             mingw-w64-x86_64-7zip
             git
             dos2unix
-          #mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-toolchain
           #mingw-w64-x86_64-cmake
           #mingw-w64-x86_64-sccache
       

From 0a7bf0995a39df7be710ef84d6087ff6ffa05e00 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 057/168] TEMP CI 54

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e0edc789c2f0..ae3f84485866b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index aab08195bfb2a..5a34cc9e8a5b6 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -132,7 +132,7 @@ x--expand-yaml-anchors--remove:
             git
             dos2unix
             mingw-w64-x86_64-toolchain
-          #mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-cmake
           #mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion

From f02dc71ae549a622b1ed34e3640c9a2fe9c5ab59 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 058/168] TEMP CI 55

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae3f84485866b..469dc40140952 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,7 +626,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: strict
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 5a34cc9e8a5b6..d791fc8becde6 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -132,8 +132,9 @@ x--expand-yaml-anchors--remove:
             git
             dos2unix
             mingw-w64-x86_64-toolchain
+            mingw-w64-i686-toolchain
             mingw-w64-x86_64-cmake
-          #mingw-w64-x86_64-sccache
+            mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From 5f74bb648ab00e781f40359901332cef345e8c94 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 059/168] TEMP CI 56

---
 .github/workflows/ci.yml     | 6 ++++++
 src/ci/github-actions/ci.yml | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 469dc40140952..b43df8ddfb1f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,6 +43,7 @@ jobs:
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
       HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
       SCCACHE_BUCKET: rust-lang-ci-sccache2
+      SCCACHE_REGION: us-west-1
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       CACHE_DOMAIN: ci-caches.rust-lang.org
     if: "github.event_name == 'pull_request'"
@@ -57,6 +58,7 @@ jobs:
               SCRIPT: make ci-mingw
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
+              MSYSTEM: MINGW32
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
@@ -72,6 +74,7 @@ jobs:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
+              MSYSTEM: MINGW32
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
             env:
@@ -198,6 +201,7 @@ jobs:
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
       HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
       SCCACHE_BUCKET: rust-lang-ci-sccache2
+      SCCACHE_REGION: us-west-1
       DEPLOY_BUCKET: rust-lang-ci2
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
@@ -599,6 +603,7 @@ jobs:
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
       HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
       SCCACHE_BUCKET: rust-lang-ci-sccache2
+      SCCACHE_REGION: us-west-1
       DEPLOY_BUCKET: rust-lang-ci2
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
@@ -730,6 +735,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       SCCACHE_BUCKET: rust-lang-ci-sccache2
+      SCCACHE_REGION: us-west-1
       DEPLOY_BUCKET: rust-lang-ci2
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index d791fc8becde6..d50dd9d50011b 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -37,11 +37,13 @@ x--expand-yaml-anchors--remove:
 
   - &public-variables
     SCCACHE_BUCKET: rust-lang-ci-sccache2
+    SCCACHE_REGION: us-west-1
     TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
     CACHE_DOMAIN: ci-caches.rust-lang.org
 
   - &prod-variables
     SCCACHE_BUCKET: rust-lang-ci-sccache2
+    SCCACHE_REGION: us-west-1
     DEPLOY_BUCKET: rust-lang-ci2
     TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
     TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
@@ -359,6 +361,7 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
+              MSYSTEM: MINGW32
             <<: *job-windows-8c
 
           - name: x86_64-mingw
@@ -385,6 +388,7 @@ jobs:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
+              MSYSTEM: MINGW32
             <<: *job-windows-8c
 
           - name: dist-x86_64-mingw

From ad1fb61780f1a08a4f13c2c0e763672f60ad4d25 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 060/168] TEMP CI 57

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b43df8ddfb1f5..b30dc495dbc84 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,7 +94,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          path-type: strict
+          path-type: inherit
           install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
@@ -495,7 +495,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          path-type: strict
+          path-type: inherit
           install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
@@ -630,7 +630,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          path-type: strict
+          path-type: inherit
           install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-sccache\n"
       - name: checkout the source code
         uses: actions/checkout@v4
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index d50dd9d50011b..09e86a1415468 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -125,7 +125,7 @@ x--expand-yaml-anchors--remove:
         with:
           msystem: MINGW64
           update: true
-          path-type: strict # Prevents inheriting any environment variables into msys2
+          path-type: inherit # Prevents inheriting any environment variables into msys2
           install: >
             make
             mingw-w64-x86_64-python

From 89997a9cb7dbb11d9a636f72c567a3571bd46d5c Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 061/168] TEMP CI 58

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b30dc495dbc84..5981d850e43da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,7 +95,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-sccache\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -496,7 +496,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-sccache\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -631,7 +631,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-sccache\n"
+          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 09e86a1415468..7edfda3ac44a1 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -136,7 +136,7 @@ x--expand-yaml-anchors--remove:
             mingw-w64-x86_64-toolchain
             mingw-w64-i686-toolchain
             mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-sccache
+          # mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh

From 0cc9246990e10e39d66cd47535d73f8871d2e276 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 062/168] TEMP CI 59

---
 .github/workflows/ci.yml     | 4 ----
 src/ci/github-actions/ci.yml | 2 --
 2 files changed, 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5981d850e43da..4d1b17deeec72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,6 @@ jobs:
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
       HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
       SCCACHE_BUCKET: rust-lang-ci-sccache2
-      SCCACHE_REGION: us-west-1
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       CACHE_DOMAIN: ci-caches.rust-lang.org
     if: "github.event_name == 'pull_request'"
@@ -201,7 +200,6 @@ jobs:
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
       HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
       SCCACHE_BUCKET: rust-lang-ci-sccache2
-      SCCACHE_REGION: us-west-1
       DEPLOY_BUCKET: rust-lang-ci2
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
@@ -603,7 +601,6 @@ jobs:
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
       HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
       SCCACHE_BUCKET: rust-lang-ci-sccache2
-      SCCACHE_REGION: us-west-1
       DEPLOY_BUCKET: rust-lang-ci2
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
@@ -735,7 +732,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       SCCACHE_BUCKET: rust-lang-ci-sccache2
-      SCCACHE_REGION: us-west-1
       DEPLOY_BUCKET: rust-lang-ci2
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 7edfda3ac44a1..cd5d6bdffca36 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -37,13 +37,11 @@ x--expand-yaml-anchors--remove:
 
   - &public-variables
     SCCACHE_BUCKET: rust-lang-ci-sccache2
-    SCCACHE_REGION: us-west-1
     TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
     CACHE_DOMAIN: ci-caches.rust-lang.org
 
   - &prod-variables
     SCCACHE_BUCKET: rust-lang-ci-sccache2
-    SCCACHE_REGION: us-west-1
     DEPLOY_BUCKET: rust-lang-ci2
     TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
     TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues

From b3c7016392699263d5fa9295d3e4a25a962ec5c5 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 063/168] TEMP CI 60

---
 .github/workflows/ci.yml        |  3 ---
 msys problem.txt                | 40 +++++++++++++++++++++++++++++++++
 src/ci/github-actions/ci.yml    | 20 ++++++++---------
 src/ci/scripts/install-mingw.sh | 11 ++++-----
 4 files changed, 56 insertions(+), 18 deletions(-)
 create mode 100644 msys problem.txt

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4d1b17deeec72..1e6ca7b1db4ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,7 +94,6 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -494,7 +493,6 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -628,7 +626,6 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make mingw-w64-x86_64-python mingw-w64-x86_64-jq mingw-w64-x86_64-7zip git dos2unix mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain mingw-w64-x86_64-cmake\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/msys problem.txt b/msys problem.txt
new file mode 100644
index 0000000000000..620fa3d16908b
--- /dev/null
+++ b/msys problem.txt	
@@ -0,0 +1,40 @@
+[src\core\config\config.rs:1155] PathBuf::from(git_root.trim()) = "/d/programming/repos/rust"
+thread 'main' panicked at src\core\config\config.rs:1155:80:
+called `Result::unwrap()` on an `Err` value: Os { code: 3, kind: NotFound, message: "The system cann
+ot find the path specified." }
+stack backtrace:
+   0: rust_begin_unwind
+             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d/library\std\src/panicking.rs:597:5
+   1: core::panicking::panic_fmt
+             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d/library\core\src/panicking.rs:72:14
+   2: core::result::unwrap_failed
+             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d/library\core\src/result.rs:1652:5
+   3: core::result::Result<T,E>::unwrap
+             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d\library\core\src/result.rs:1077:23
+   4: bootstrap::core::config::config::Config::parse_inner
+             at .\src\bootstrap\src\core\config\config.rs:1155:28
+   5: bootstrap::core::config::config::Config::parse
+             at .\src\bootstrap\src\core\config\config.rs:1111:9
+   6: bootstrap::main
+             at .\src\bootstrap\src/bin\main.rs:20:18
+   7: core::ops::function::FnOnce::call_once
+             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d\library\core\src\ops/function.rs:250:5
+
+Things to try: use native python. use native git. Use git bash (which is also msys)?
+Is it because mingw on msys is essentially a cross-compiler, from msys to windows native? i.e. from a posix-y emulated environment to
+a windows native one. So the src/bootstrap binary expects windows-y paths, unlike the rest of the build
+environment which wants posix-y paths. Maybe we should be treating this more like a cross compile, and
+building bootstrap with the msys profile rather than the mingw profile (profiles of msys, that is).
+Or alternatively, we could teach bootstrap to understand the msys paths and convert them to windows
+paths, maybe with an environment variable or flag, as a hack. We could also tell people to just use
+git-for-windows instead, as a different hack.
+
+Like, what happens if you target i686 on an x86_64 host? Bootstrap gets built for x86_64, surely?
+
+Maybe the problem is that I set build.build triple to windows-gnu in config.toml?
+
+Trying delete msys git and "PATH=$PATH:/c/Program\ Files/Git/cmd/ python x.py build"... Seems to be working!
+
+Should try delete msys python and "^^^"
+
+CI is probably passing because git-for-windows is still on the PATH, even after the shell changes to msys one.
\ No newline at end of file
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index cd5d6bdffca36..c0b206600f12b 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -124,16 +124,16 @@ x--expand-yaml-anchors--remove:
           msystem: MINGW64
           update: true
           path-type: inherit # Prevents inheriting any environment variables into msys2
-          install: >
-            make
-            mingw-w64-x86_64-python
-            mingw-w64-x86_64-jq
-            mingw-w64-x86_64-7zip
-            git
-            dos2unix
-            mingw-w64-x86_64-toolchain
-            mingw-w64-i686-toolchain
-            mingw-w64-x86_64-cmake
+          # install: >
+          #   make
+          #   mingw-w64-x86_64-python
+          #   mingw-w64-x86_64-jq
+          #   mingw-w64-x86_64-7zip
+          #   git
+          #   dos2unix
+          #   mingw-w64-x86_64-toolchain
+          #   mingw-w64-i686-toolchain
+          #   mingw-w64-x86_64-cmake
           # mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 31c25f8453d7d..eeeba6a48819b 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -67,12 +67,13 @@ if isWindows; then
     fi
     echo "MAJAHA 4: $(cygpath -w $(which git))"
     echo "MAJAHA 4: $(cygpath -w $(which python))"
+    echo "MAJAHA 4: $(cygpath -w $(which gcc))"
     echo "LS: $(ls)"
     echo "GITHUB_PATH: $GITHUB_PATH"
     cat "$GITHUB_PATH"
-    echo "MAJAHA /etc/pacman.conf"
-    cat /etc/pacman.conf
-    echo "\n"
-    echo "MAJAHA /etc/pacman.d/mirrorlist.mingw64"
-    cat /etc/pacman.d/mirrorlist.mingw64
+    # echo "MAJAHA /etc/pacman.conf"
+    # cat /etc/pacman.conf
+    # echo "\n"
+    # echo "MAJAHA /etc/pacman.d/mirrorlist.mingw64"
+    # cat /etc/pacman.d/mirrorlist.mingw64
 fi

From 371a18501f0f2aa17eb19ccbdad5fa645ac073a0 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 064/168] TEMP CI 61

---
 .github/workflows/ci.yml     | 3 +++
 src/ci/github-actions/ci.yml | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e6ca7b1db4ba..9b23df4337961 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,6 +94,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
+          install: "make\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -493,6 +494,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
+          install: "make\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,6 +628,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
+          install: "make\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index c0b206600f12b..f8bd33d828143 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -124,8 +124,8 @@ x--expand-yaml-anchors--remove:
           msystem: MINGW64
           update: true
           path-type: inherit # Prevents inheriting any environment variables into msys2
-          # install: >
-          #   make
+          install: >
+            make
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq
           #   mingw-w64-x86_64-7zip

From 427c5c1cdfc3063f4a4c5744504bd218290603a6 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 29 Dec 2023 09:10:30 +0000
Subject: [PATCH 065/168] Revert "Fix bootstrap issue with git on MSYS"

This reverts commit e06c3aaff1515ec32520bbf863edc93f83feb41d.
---
 src/bootstrap/src/core/config/config.rs | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index fe1b0f5a78a98..f1e1b89d9ba71 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -1228,16 +1228,12 @@ impl Config {
         // Infer the rest of the configuration.
 
         // Infer the source directory. This is non-trivial because we want to support a downloaded bootstrap binary,
-        // running on a completely different machine from where it was compiled.
+        // running on a completely machine from where it was compiled.
         let mut cmd = Command::new("git");
-        // NOTE: we cannot support running from outside the repository because the only other path we have available
-        // is set at compile time, which can be wrong if bootstrap was downloaded rather than compiled locally.
+        // NOTE: we cannot support running from outside the repository because the only path we have available
+        // is set at compile time, which can be wrong if bootstrap was downloaded from source.
         // We still support running outside the repository if we find we aren't in a git directory.
-
-        // NOTE: We get a relative path from git to work around an issue on MSYS/mingw. If we used an absolute path,
-        // and end up using MSYS's git rather than git-for-windows, we would get a unix-y MSYS path. But as bootstrap
-        // has already been (kinda-cross-)compiled to Windows land, we require a normal Windows path.
-        cmd.arg("rev-parse").arg("--show-cdup");
+        cmd.arg("rev-parse").arg("--show-toplevel");
         // Discard stderr because we expect this to fail when building from a tarball.
         let output = cmd
             .stderr(std::process::Stdio::null())
@@ -1245,14 +1241,9 @@ impl Config {
             .ok()
             .and_then(|output| if output.status.success() { Some(output) } else { None });
         if let Some(output) = output {
-            let git_root_relative = String::from_utf8(output.stdout).unwrap();
-            // We need to canonicalize this path to make sure it uses backslashes instead of forward slashes,
-            // and to resolve any relative components.
-            let git_root = env::current_dir()
-                .unwrap()
-                .join(PathBuf::from(git_root_relative.trim()))
-                .canonicalize()
-                .unwrap();
+            let git_root = String::from_utf8(output.stdout).unwrap();
+            // We need to canonicalize this path to make sure it uses backslashes instead of forward slashes.
+            let git_root = PathBuf::from(git_root.trim()).canonicalize().unwrap();
             let s = git_root.to_str().unwrap();
 
             // Bootstrap is quite bad at handling /? in front of paths

From c9100146b8e561eaae85f9820c72ffeb872fc0de Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 066/168] TEMP CI 62

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b23df4337961..ba78056d7a462 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,7 +94,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make\n"
+          install: "make git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -494,7 +494,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make\n"
+          install: "make git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -628,7 +628,7 @@ jobs:
           msystem: MINGW64
           update: true
           path-type: inherit
-          install: "make\n"
+          install: "make git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index f8bd33d828143..3f6758262e3b6 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -126,10 +126,10 @@ x--expand-yaml-anchors--remove:
           path-type: inherit # Prevents inheriting any environment variables into msys2
           install: >
             make
+            git
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq
           #   mingw-w64-x86_64-7zip
-          #   git
           #   dos2unix
           #   mingw-w64-x86_64-toolchain
           #   mingw-w64-i686-toolchain

From 7d7f16d1028532ca9218f429095be6aae91d4eba Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 29 Dec 2023 12:20:37 +0000
Subject: [PATCH 067/168] Reapply "Fix bootstrap issue with git on MSYS"

This reverts commit 427c5c1cdfc3063f4a4c5744504bd218290603a6.
---
 src/bootstrap/src/core/config/config.rs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index f1e1b89d9ba71..fe1b0f5a78a98 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -1228,12 +1228,16 @@ impl Config {
         // Infer the rest of the configuration.
 
         // Infer the source directory. This is non-trivial because we want to support a downloaded bootstrap binary,
-        // running on a completely machine from where it was compiled.
+        // running on a completely different machine from where it was compiled.
         let mut cmd = Command::new("git");
-        // NOTE: we cannot support running from outside the repository because the only path we have available
-        // is set at compile time, which can be wrong if bootstrap was downloaded from source.
+        // NOTE: we cannot support running from outside the repository because the only other path we have available
+        // is set at compile time, which can be wrong if bootstrap was downloaded rather than compiled locally.
         // We still support running outside the repository if we find we aren't in a git directory.
-        cmd.arg("rev-parse").arg("--show-toplevel");
+
+        // NOTE: We get a relative path from git to work around an issue on MSYS/mingw. If we used an absolute path,
+        // and end up using MSYS's git rather than git-for-windows, we would get a unix-y MSYS path. But as bootstrap
+        // has already been (kinda-cross-)compiled to Windows land, we require a normal Windows path.
+        cmd.arg("rev-parse").arg("--show-cdup");
         // Discard stderr because we expect this to fail when building from a tarball.
         let output = cmd
             .stderr(std::process::Stdio::null())
@@ -1241,9 +1245,14 @@ impl Config {
             .ok()
             .and_then(|output| if output.status.success() { Some(output) } else { None });
         if let Some(output) = output {
-            let git_root = String::from_utf8(output.stdout).unwrap();
-            // We need to canonicalize this path to make sure it uses backslashes instead of forward slashes.
-            let git_root = PathBuf::from(git_root.trim()).canonicalize().unwrap();
+            let git_root_relative = String::from_utf8(output.stdout).unwrap();
+            // We need to canonicalize this path to make sure it uses backslashes instead of forward slashes,
+            // and to resolve any relative components.
+            let git_root = env::current_dir()
+                .unwrap()
+                .join(PathBuf::from(git_root_relative.trim()))
+                .canonicalize()
+                .unwrap();
             let s = git_root.to_str().unwrap();
 
             // Bootstrap is quite bad at handling /? in front of paths

From 31d778d9dc869c7fd2925528e0eef8e4873ba3f2 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 27 Dec 2023 20:26:16 +0000
Subject: [PATCH 068/168] TEMP CI 63

---
 .github/workflows/ci.yml     | 3 +++
 src/ci/github-actions/ci.yml | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba78056d7a462..2be474904896a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,6 +93,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
+          release: false
           path-type: inherit
           install: "make git\n"
       - name: checkout the source code
@@ -493,6 +494,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
+          release: false
           path-type: inherit
           install: "make git\n"
       - name: checkout the source code
@@ -627,6 +629,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
+          release: false
           path-type: inherit
           install: "make git\n"
       - name: checkout the source code
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 3f6758262e3b6..ca9acd1e8f581 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -123,7 +123,8 @@ x--expand-yaml-anchors--remove:
         with:
           msystem: MINGW64
           update: true
-          path-type: inherit # Prevents inheriting any environment variables into msys2
+          release: false
+          path-type: inherit
           install: >
             make
             git

From 807f678bce46da653113f1b651a85bc20935a8ce Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 29 Dec 2023 12:20:37 +0000
Subject: [PATCH 069/168] TEMP CI 64

This reverts commit 427c5c1cdfc3063f4a4c5744504bd218290603a6.
---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2be474904896a..f7a6ea57c3740 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-          update: true
+          update: false
           release: false
           path-type: inherit
           install: "make git\n"
@@ -493,7 +493,7 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-          update: true
+          update: false
           release: false
           path-type: inherit
           install: "make git\n"
@@ -628,7 +628,7 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-          update: true
+          update: false
           release: false
           path-type: inherit
           install: "make git\n"
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index ca9acd1e8f581..2f65a81ce4118 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -117,12 +117,11 @@ x--expand-yaml-anchors--remove:
     runs-on: "${{ matrix.os }}"
     env:
       <<: *shared-ci-variables
-      #MSYS2_PATH_TYPE: inherit
     steps:
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-          update: true
+          update: false
           release: false
           path-type: inherit
           install: >

From b464ef1d90741ec94d7d40c3208aae5c40beca01 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 29 Dec 2023 12:20:37 +0000
Subject: [PATCH 070/168] TEMP CI 65

This reverts commit 427c5c1cdfc3063f4a4c5744504bd218290603a6.
---
 src/ci/scripts/install-msys2.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 64f8b58c3fc6a..3a806b373df98 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -38,8 +38,8 @@ if isWindows; then
         cp "${python_home}/python.exe" "${python_home}/python3.exe"
     fi
     echo "MAJAHA 1: $(cygpath -w $(which python))"
-    #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    #ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
+    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
+    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
     echo "MAJAHA 2: $(cygpath -w $(which python))"
     echo "LS: $(ls)"
     echo "GITHUB_PATH: $GITHUB_PATH"

From 73aa76507b57468b04062a395804427e47c55438 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 1 Jan 2024 12:54:43 +0000
Subject: [PATCH 071/168] Add some explaination

---
 .github/workflows/ci.yml     | 12 ++++++------
 src/ci/github-actions/ci.yml |  9 +++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7a6ea57c3740..fa7d4fb20db30 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,11 +89,11 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: msys2/setup-msys2@v2
+      - uses: msys2/setup-msys2@v2.21.0
         with:
           msystem: MINGW64
           update: false
-          release: false
+          release: true
           path-type: inherit
           install: "make git\n"
       - name: checkout the source code
@@ -490,11 +490,11 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: msys2/setup-msys2@v2
+      - uses: msys2/setup-msys2@v2.21.0
         with:
           msystem: MINGW64
           update: false
-          release: false
+          release: true
           path-type: inherit
           install: "make git\n"
       - name: checkout the source code
@@ -625,11 +625,11 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: msys2/setup-msys2@v2
+      - uses: msys2/setup-msys2@v2.21.0
         with:
           msystem: MINGW64
           update: false
-          release: false
+          release: true
           path-type: inherit
           install: "make git\n"
       - name: checkout the source code
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 2f65a81ce4118..3927b72c47275 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -118,11 +118,16 @@ x--expand-yaml-anchors--remove:
     env:
       <<: *shared-ci-variables
     steps:
-      - uses: msys2/setup-msys2@v2
+      - uses: msys2/setup-msys2@v2.21.0
         with:
           msystem: MINGW64
+          # don't try to download package updates from the network
           update: false
-          release: false
+          # don't try to use the msys that comes built-in to the github runner,
+          # so we can control what is installed (i.e. not python)
+          release: true
+          # Inherit the full path from the windows environment, with msys's */bin/
+          # dirs placed in front. This lets us run Windows-native Python etc.
           path-type: inherit
           install: >
             make

From 357213f024feac5ff5c53f9eea95c12a12c1b485 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 2 Jan 2024 03:35:43 +0000
Subject: [PATCH 072/168] remove make

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa7d4fb20db30..436837accef66 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,7 +95,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git\n"
+          install: "git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -496,7 +496,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git\n"
+          install: "git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -631,7 +631,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git\n"
+          install: "git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 3927b72c47275..4561755070029 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -130,8 +130,8 @@ x--expand-yaml-anchors--remove:
           # dirs placed in front. This lets us run Windows-native Python etc.
           path-type: inherit
           install: >
-            make
             git
+          #   make
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq
           #   mingw-w64-x86_64-7zip

From 87e2260ab73b4f1d2014813d9028364751a22aa3 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 2 Jan 2024 08:11:17 +0000
Subject: [PATCH 073/168] Revert "remove make"

This reverts commit 357213f024feac5ff5c53f9eea95c12a12c1b485.
---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 436837accef66..fa7d4fb20db30 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,7 +95,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "git\n"
+          install: "make git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -496,7 +496,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "git\n"
+          install: "make git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -631,7 +631,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "git\n"
+          install: "make git\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 4561755070029..3927b72c47275 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -130,8 +130,8 @@ x--expand-yaml-anchors--remove:
           # dirs placed in front. This lets us run Windows-native Python etc.
           path-type: inherit
           install: >
+            make
             git
-          #   make
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq
           #   mingw-w64-x86_64-7zip

From 537bf4b39193823cf622154a00078e7ec360d47a Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 3 Jan 2024 09:30:56 +0000
Subject: [PATCH 074/168] .

---
 .github/workflows/ci.yml     | 18 ++++++------------
 src/ci/github-actions/ci.yml |  9 +++++----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa7d4fb20db30..5caa0e2912e72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,13 +83,11 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
-    defaults:
-      run:
-        shell: "msys2 {0}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: msys2/setup-msys2@v2.21.0
+      - if: ~
+        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
           msystem: MINGW64
           update: false
@@ -484,13 +482,11 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
             os: windows-2019-8core-32gb
-    defaults:
-      run:
-        shell: "msys2 {0}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: msys2/setup-msys2@v2.21.0
+      - if: ~
+        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
           msystem: MINGW64
           update: false
@@ -619,13 +615,11 @@ jobs:
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
-    defaults:
-      run:
-        shell: "msys2 {0}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: msys2/setup-msys2@v2.21.0
+      - if: ~
+        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
           msystem: MINGW64
           update: false
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 3927b72c47275..e28b7bbefdeb4 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -110,15 +110,16 @@ x--expand-yaml-anchors--remove:
     if: success() && !env.SKIP_JOB
 
   - &base-ci-job
-    defaults:
-      run:
-        shell: msys2 {0}
+    # defaults:
+    #   run:
+    #     shell: msys2 {0} # move this to each mingw job / it's own &anchor
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env:
       <<: *shared-ci-variables
     steps:
-      - uses: msys2/setup-msys2@v2.21.0
+      - if: 
+        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
         with:
           msystem: MINGW64
           # don't try to download package updates from the network

From b5695fce7c7de66ac1b2e4932461cad4da84c971 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 3 Jan 2024 15:24:19 +0000
Subject: [PATCH 075/168] .

---
 .github/workflows/ci.yml     | 10 ++++++++++
 src/ci/github-actions/ci.yml |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5caa0e2912e72..07c81ffb1cf09 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,6 +58,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
+            shell: "msys2 {0}"
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
@@ -83,6 +84,9 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
+    defaults:
+      run:
+        shell: "${{ matrix.shell }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -482,6 +486,9 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
             os: windows-2019-8core-32gb
+    defaults:
+      run:
+        shell: "${{ matrix.shell }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -615,6 +622,9 @@ jobs:
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
+    defaults:
+      run:
+        shell: "${{ matrix.shell }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index e28b7bbefdeb4..ae28564c5d4a3 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -110,9 +110,9 @@ x--expand-yaml-anchors--remove:
     if: success() && !env.SKIP_JOB
 
   - &base-ci-job
-    # defaults:
-    #   run:
-    #     shell: msys2 {0} # move this to each mingw job / it's own &anchor
+    defaults:
+        run:
+          shell: ${{ matrix.shell }}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env:
@@ -366,6 +366,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
+            shell: msys2 {0}
             <<: *job-windows-8c
 
           - name: x86_64-mingw

From 5a1eb2bf6b4db1851e64af4e5cd0d29fa226e409 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 3 Jan 2024 16:16:50 +0000
Subject: [PATCH 076/168] .

---
 .github/workflows/ci.yml     | 10 ++++++++++
 src/ci/github-actions/ci.yml | 11 +++++++++++
 2 files changed, 21 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 07c81ffb1cf09..a2eb243215ae3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - shell: bash
           - name: i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
@@ -84,6 +85,14 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
+          - name: x86_64-gnu
+            os: ubuntu-20.04-4core-16gb
+            env: {}
+          - name: x86_64-msvc
+            env:
+              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
+              SCRIPT: make ci-msvc
+            os: windows-2019-8core-32gb
     defaults:
       run:
         shell: "${{ matrix.shell }}"
@@ -215,6 +224,7 @@ jobs:
     strategy:
       matrix:
         include:
+          - shell: bash
           - name: aarch64-gnu
             os:
               - self-hosted
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index ae28564c5d4a3..d8ed3f8fa09e3 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -357,6 +357,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - shell: bash
           - name: i686-mingw
             env:
               RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
@@ -410,6 +411,15 @@ jobs:
               DIST_REQUIRE_ALL_TOOLS: 1
             <<: *job-windows-8c
 
+          - name: x86_64-gnu
+            <<: *job-linux-4c
+          
+          - name: x86_64-msvc
+            env:
+              RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
+              SCRIPT: make ci-msvc
+            <<: *job-windows-8c
+
   auto:
     <<: *base-ci-job
     name: auto - ${{ matrix.name }}
@@ -419,6 +429,7 @@ jobs:
     strategy:
       matrix:
         include:
+          - shell: bash
           #############################
           #   Linux/Docker builders   #
           #############################

From 3bb8a28d9b08f60bf0b56f88b3c79d7ffd474052 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 3 Jan 2024 16:39:16 +0000
Subject: [PATCH 077/168] .

---
 .github/workflows/ci.yml     | 9 +++------
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2eb243215ae3..7a544cbbc88c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,8 +99,7 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - if: ~
-        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
+      - uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
           msystem: MINGW64
           update: false
@@ -502,8 +501,7 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - if: ~
-        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
+      - uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
           msystem: MINGW64
           update: false
@@ -638,8 +636,7 @@ jobs:
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - if: ~
-        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
+      - uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
           msystem: MINGW64
           update: false
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index d8ed3f8fa09e3..4678739f8d26b 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -118,7 +118,7 @@ x--expand-yaml-anchors--remove:
     env:
       <<: *shared-ci-variables
     steps:
-      - if: 
+      - #if: 
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
         with:
           msystem: MINGW64

From c41156d7b7a255f70d2556d77b5af7ef0ba3798b Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 3 Jan 2024 17:21:15 +0000
Subject: [PATCH 078/168] .

---
 .github/workflows/ci.yml     | 9 ++++-----
 src/ci/github-actions/ci.yml | 5 ++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7a544cbbc88c7..c0773a80b05a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - shell: bash
           - name: i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
@@ -59,7 +58,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
-            shell: "msys2 {0}"
+            msys2: true
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
@@ -95,7 +94,7 @@ jobs:
             os: windows-2019-8core-32gb
     defaults:
       run:
-        shell: "${{ matrix.shell }}"
+        shell: "${{ matrix.msys2 && msys2 {0} || bash }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -497,7 +496,7 @@ jobs:
             os: windows-2019-8core-32gb
     defaults:
       run:
-        shell: "${{ matrix.shell }}"
+        shell: "${{ matrix.msys2 && msys2 {0} || bash }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -632,7 +631,7 @@ jobs:
             os: ubuntu-20.04-16core-64gb
     defaults:
       run:
-        shell: "${{ matrix.shell }}"
+        shell: "${{ matrix.msys2 && msys2 {0} || bash }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 4678739f8d26b..edf62e7f177d3 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -112,7 +112,7 @@ x--expand-yaml-anchors--remove:
   - &base-ci-job
     defaults:
         run:
-          shell: ${{ matrix.shell }}
+          shell: ${{ matrix.msys2 && msys2 {0} || bash }}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env:
@@ -357,7 +357,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - shell: bash
           - name: i686-mingw
             env:
               RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
@@ -367,7 +366,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
-            shell: msys2 {0}
+            msys2: true
             <<: *job-windows-8c
 
           - name: x86_64-mingw

From 33ec1b510c089919326fcaefa6354ca4f6e62ed0 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 3 Jan 2024 17:44:02 +0000
Subject: [PATCH 079/168] .

---
 .github/workflows/ci.yml     | 1 -
 src/ci/github-actions/ci.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c0773a80b05a0..35bab5efaca87 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -222,7 +222,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - shell: bash
           - name: aarch64-gnu
             os:
               - self-hosted
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index edf62e7f177d3..140d92cfd16a1 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -428,7 +428,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - shell: bash
           #############################
           #   Linux/Docker builders   #
           #############################

From 4a1fac97eee8b9527cbe9d0e1cadecb75b79565f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 3 Jan 2024 18:32:22 +0000
Subject: [PATCH 080/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35bab5efaca87..17575ec7a2138 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,7 +94,7 @@ jobs:
             os: windows-2019-8core-32gb
     defaults:
       run:
-        shell: "${{ matrix.msys2 && msys2 {0} || bash }}"
+        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -495,7 +495,7 @@ jobs:
             os: windows-2019-8core-32gb
     defaults:
       run:
-        shell: "${{ matrix.msys2 && msys2 {0} || bash }}"
+        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -630,7 +630,7 @@ jobs:
             os: ubuntu-20.04-16core-64gb
     defaults:
       run:
-        shell: "${{ matrix.msys2 && msys2 {0} || bash }}"
+        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 140d92cfd16a1..75c413280eba0 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -111,15 +111,14 @@ x--expand-yaml-anchors--remove:
 
   - &base-ci-job
     defaults:
-        run:
-          shell: ${{ matrix.msys2 && msys2 {0} || bash }}
+      run:
+        shell: ${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env:
       <<: *shared-ci-variables
     steps:
-      - #if: 
-        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
+      - uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
         with:
           msystem: MINGW64
           # don't try to download package updates from the network

From db4fbd5214db56c6cd68e6fb427f17c12d3a58f7 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 3 Jan 2024 18:37:08 +0000
Subject: [PATCH 081/168] .

---
 .github/workflows/ci.yml     | 9 ---------
 src/ci/github-actions/ci.yml | 6 +++---
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 17575ec7a2138..cd2bb6ec809fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,9 +92,6 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
               SCRIPT: make ci-msvc
             os: windows-2019-8core-32gb
-    defaults:
-      run:
-        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -493,9 +490,6 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
             os: windows-2019-8core-32gb
-    defaults:
-      run:
-        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -628,9 +622,6 @@ jobs:
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
-    defaults:
-      run:
-        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 75c413280eba0..5e73f44d70e41 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -110,9 +110,9 @@ x--expand-yaml-anchors--remove:
     if: success() && !env.SKIP_JOB
 
   - &base-ci-job
-    defaults:
-      run:
-        shell: ${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}
+    # defaults:
+    #   run:
+    #     shell: ${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env:

From db7a077d66bce9fd657e2b8a8c5a06c5eab90c5c Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 4 Jan 2024 07:48:07 +0000
Subject: [PATCH 082/168] .

---
 .github/workflows/ci.yml     | 11 ++++++++++-
 src/ci/github-actions/ci.yml |  8 ++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd2bb6ec809fb..2ede30e6130c9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
-            msys2: true
+            msys2: 1
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
@@ -92,6 +92,9 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
               SCRIPT: make ci-msvc
             os: windows-2019-8core-32gb
+    defaults:
+      run:
+        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -490,6 +493,9 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
             os: windows-2019-8core-32gb
+    defaults:
+      run:
+        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -622,6 +628,9 @@ jobs:
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
+    defaults:
+      run:
+        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 5e73f44d70e41..34af9ce69ccdd 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -110,9 +110,9 @@ x--expand-yaml-anchors--remove:
     if: success() && !env.SKIP_JOB
 
   - &base-ci-job
-    # defaults:
-    #   run:
-    #     shell: ${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}
+    defaults:
+      run:
+        shell: ${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env:
@@ -365,7 +365,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
-            msys2: true
+            msys2: 1
             <<: *job-windows-8c
 
           - name: x86_64-mingw

From f2f97e8f5ca689944253cdf5e3c0d24176ae62f6 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 4 Jan 2024 08:10:36 +0000
Subject: [PATCH 083/168] .

---
 .github/workflows/ci.yml     | 7 ++++++-
 src/ci/github-actions/ci.yml | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2ede30e6130c9..db2a94e666bc9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
-            msys2: 1
+            msys2: true
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
@@ -66,6 +66,7 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
+            msys2: true
             os: windows-2019-8core-32gb
           - name: dist-i686-mingw
             env:
@@ -75,6 +76,7 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
               MSYSTEM: MINGW32
+            msys2: true
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
             env:
@@ -83,14 +85,17 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
+            msys2: true
             os: windows-2019-8core-32gb
           - name: x86_64-gnu
+            msys2: false
             os: ubuntu-20.04-4core-16gb
             env: {}
           - name: x86_64-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
               SCRIPT: make ci-msvc
+            msys2: false
             os: windows-2019-8core-32gb
     defaults:
       run:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 34af9ce69ccdd..039a04186ad31 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -365,7 +365,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
-            msys2: 1
+            msys2: true
             <<: *job-windows-8c
 
           - name: x86_64-mingw
@@ -378,6 +378,7 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
+            msys2: true
             <<: *job-windows-8c
           
           - name: dist-i686-mingw
@@ -393,6 +394,7 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
               MSYSTEM: MINGW32
+            msys2: true
             <<: *job-windows-8c
 
           - name: dist-x86_64-mingw
@@ -407,15 +409,18 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
+            msys2: true
             <<: *job-windows-8c
 
           - name: x86_64-gnu
+            msys2: false
             <<: *job-linux-4c
           
           - name: x86_64-msvc
             env:
               RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
               SCRIPT: make ci-msvc
+            msys2: false
             <<: *job-windows-8c
 
   auto:

From fa00becaee2212902bd31b662ca83fd81ef6a3c7 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 4 Jan 2024 08:24:25 +0000
Subject: [PATCH 084/168] .

---
 .github/workflows/ci.yml     | 55 ++++++++++++++++++++++++++++++++++++
 src/ci/github-actions/ci.yml |  1 +
 2 files changed, 56 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db2a94e666bc9..1103c211cc22a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -235,126 +235,163 @@ jobs:
           - name: arm-android
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: armhf-gnu
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-aarch64-linux
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-8core-32gb
+            msys2: false
           - name: dist-android
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-arm-linux
             os: ubuntu-20.04-16core-64gb
             env: {}
+            msys2: false
           - name: dist-armhf-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-armv7-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-i586-gnu-i586-i686-musl
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-i686-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-loongarch64-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-powerpc-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-powerpc64-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-powerpc64le-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-riscv64-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-s390x-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-various-1
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-various-2
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-x86_64-freebsd
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-x86_64-illumos
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: dist-x86_64-linux
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
+            msys2: false
           - name: dist-x86_64-linux-alt
             env:
               IMAGE: dist-x86_64-linux
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
+            msys2: false
           - name: dist-x86_64-musl
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-8core-32gb
+            msys2: false
           - name: dist-x86_64-netbsd
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: i686-gnu
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: i686-gnu-nopt
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: mingw-check
             os: ubuntu-20.04-4core-16gb
             env: {}
+            msys2: false
           - name: test-various
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: x86_64-gnu
             os: ubuntu-20.04-4core-16gb
             env: {}
+            msys2: false
           - name: x86_64-gnu-stable
             env:
               IMAGE: x86_64-gnu
               RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
               CI_ONLY_WHEN_CHANNEL: nightly
             os: ubuntu-20.04-4core-16gb
+            msys2: false
           - name: x86_64-gnu-aux
             os: ubuntu-20.04-4core-16gb
             env: {}
+            msys2: false
           - name: x86_64-gnu-integration
             env:
               CI_ONLY_WHEN_CHANNEL: nightly
             os: ubuntu-20.04-16core-64gb
+            msys2: false
           - name: x86_64-gnu-debug
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: x86_64-gnu-distcheck
             os: ubuntu-20.04-8core-32gb
             env: {}
+            msys2: false
           - name: x86_64-gnu-llvm-17
             env:
               RUST_BACKTRACE: 1
             os: ubuntu-20.04-8core-32gb
+            msys2: false
           - name: x86_64-gnu-llvm-16
             env:
               RUST_BACKTRACE: 1
             os: ubuntu-20.04-8core-32gb
+            msys2: false
           - name: x86_64-gnu-nopt
             os: ubuntu-20.04-4core-16gb
             env: {}
+            msys2: false
           - name: x86_64-gnu-tools
             env:
               DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
             os: ubuntu-20.04-8core-32gb
+            msys2: false
           - name: dist-x86_64-apple
             env:
               SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
@@ -368,6 +405,7 @@ jobs:
               DIST_REQUIRE_ALL_TOOLS: 1
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: macos-13
+            msys2: false
           - name: dist-apple-various
             env:
               SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -379,6 +417,7 @@ jobs:
               NO_DEBUG_ASSERTIONS: 1
               NO_OVERFLOW_CHECKS: 1
             os: macos-13
+            msys2: false
           - name: x86_64-apple-1
             env:
               SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"
@@ -390,6 +429,7 @@ jobs:
               NO_DEBUG_ASSERTIONS: 1
               NO_OVERFLOW_CHECKS: 1
             os: macos-13
+            msys2: false
           - name: x86_64-apple-2
             env:
               SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -401,6 +441,7 @@ jobs:
               NO_DEBUG_ASSERTIONS: 1
               NO_OVERFLOW_CHECKS: 1
             os: macos-13
+            msys2: false
           - name: dist-aarch64-apple
             env:
               SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
@@ -415,6 +456,7 @@ jobs:
               NO_OVERFLOW_CHECKS: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: macos-13-xlarge
+            msys2: false
           - name: aarch64-apple
             env:
               SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
@@ -428,16 +470,19 @@ jobs:
               NO_DEBUG_ASSERTIONS: 1
               NO_OVERFLOW_CHECKS: 1
             os: macos-13-xlarge
+            msys2: false
           - name: x86_64-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
               SCRIPT: make ci-msvc
             os: windows-2019-8core-32gb
+            msys2: false
           - name: i686-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
               SCRIPT: make ci-msvc
             os: windows-2019-8core-32gb
+            msys2: false
           - name: x86_64-msvc-ext
             env:
               SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
@@ -445,6 +490,7 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json"
               DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
             os: windows-2019-8core-32gb
+            msys2: false
           - name: i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
@@ -452,6 +498,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
+            msys2: false
           - name: x86_64-mingw
             env:
               SCRIPT: make ci-mingw
@@ -459,24 +506,28 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
+            msys2: false
           - name: dist-x86_64-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler"
               SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
+            msys2: false
           - name: dist-i686-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
+            msys2: false
           - name: dist-aarch64-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
+            msys2: false
           - name: dist-i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
@@ -485,6 +536,7 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
+            msys2: false
           - name: dist-x86_64-mingw
             env:
               SCRIPT: python x.py dist bootstrap --include-default-paths
@@ -493,11 +545,13 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
+            msys2: false
           - name: dist-x86_64-msvc-alt
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
             os: windows-2019-8core-32gb
+            msys2: false
     defaults:
       run:
         shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
@@ -633,6 +687,7 @@ jobs:
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
+            msys2: false
     defaults:
       run:
         shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 039a04186ad31..edecf9df759a9 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -74,6 +74,7 @@ x--expand-yaml-anchors--remove:
 
   - &base-job
     env: {}
+    msys2: false
 
   - &job-linux-4c
     os: ubuntu-20.04-4core-16gb

From 2253f98e13a9cf94c92f7afa6d8a6f6b498865f3 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 4 Jan 2024 10:20:06 +0000
Subject: [PATCH 085/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f006010a8ca5f..846dcaf5037b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
             os: windows-2019-8core-32gb
     defaults:
       run:
-        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
+        shell: "${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -541,7 +541,7 @@ jobs:
             msys2: false
     defaults:
       run:
-        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
+        shell: "${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
@@ -677,7 +677,7 @@ jobs:
             msys2: false
     defaults:
       run:
-        shell: "${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}"
+        shell: "${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index b68d5a034346d..450dcaa18e3db 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -113,7 +113,7 @@ x--expand-yaml-anchors--remove:
   - &base-ci-job
     defaults:
       run:
-        shell: ${{ matrix.msys2 && 'msys2 {0}'' || 'bash' }}
+        shell: ${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env:

From 1653872d12fa2f574780312cecb3875c4f8dbcc3 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 4 Jan 2024 10:28:13 +0000
Subject: [PATCH 086/168] .

---
 .github/workflows/ci.yml     | 56 ------------------------------------
 src/ci/github-actions/ci.yml |  6 ++--
 2 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 846dcaf5037b0..cb8e2c0b95255 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,14 +88,12 @@ jobs:
             msys2: true
             os: windows-2019-8core-32gb
           - name: x86_64-gnu
-            msys2: false
             os: ubuntu-20.04-4core-16gb
             env: {}
           - name: x86_64-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
               SCRIPT: make ci-msvc
-            msys2: false
             os: windows-2019-8core-32gb
     defaults:
       run:
@@ -235,163 +233,126 @@ jobs:
           - name: arm-android
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: armhf-gnu
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-aarch64-linux
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-8core-32gb
-            msys2: false
           - name: dist-android
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-arm-linux
             os: ubuntu-20.04-16core-64gb
             env: {}
-            msys2: false
           - name: dist-armhf-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-armv7-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-i586-gnu-i586-i686-musl
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-i686-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-loongarch64-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-powerpc-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-powerpc64-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-powerpc64le-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-riscv64-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-s390x-linux
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-various-1
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-various-2
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-x86_64-freebsd
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-x86_64-illumos
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: dist-x86_64-linux
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
-            msys2: false
           - name: dist-x86_64-linux-alt
             env:
               IMAGE: dist-x86_64-linux
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
-            msys2: false
           - name: dist-x86_64-musl
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-8core-32gb
-            msys2: false
           - name: dist-x86_64-netbsd
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: i686-gnu
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: i686-gnu-nopt
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: mingw-check
             os: ubuntu-20.04-4core-16gb
             env: {}
-            msys2: false
           - name: test-various
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: x86_64-gnu
             os: ubuntu-20.04-4core-16gb
             env: {}
-            msys2: false
           - name: x86_64-gnu-stable
             env:
               IMAGE: x86_64-gnu
               RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
               CI_ONLY_WHEN_CHANNEL: nightly
             os: ubuntu-20.04-4core-16gb
-            msys2: false
           - name: x86_64-gnu-aux
             os: ubuntu-20.04-4core-16gb
             env: {}
-            msys2: false
           - name: x86_64-gnu-integration
             env:
               CI_ONLY_WHEN_CHANNEL: nightly
             os: ubuntu-20.04-16core-64gb
-            msys2: false
           - name: x86_64-gnu-debug
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: x86_64-gnu-distcheck
             os: ubuntu-20.04-8core-32gb
             env: {}
-            msys2: false
           - name: x86_64-gnu-llvm-17
             env:
               RUST_BACKTRACE: 1
             os: ubuntu-20.04-8core-32gb
-            msys2: false
           - name: x86_64-gnu-llvm-16
             env:
               RUST_BACKTRACE: 1
             os: ubuntu-20.04-8core-32gb
-            msys2: false
           - name: x86_64-gnu-nopt
             os: ubuntu-20.04-4core-16gb
             env: {}
-            msys2: false
           - name: x86_64-gnu-tools
             env:
               DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
             os: ubuntu-20.04-8core-32gb
-            msys2: false
           - name: dist-x86_64-apple
             env:
               SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
@@ -405,7 +366,6 @@ jobs:
               DIST_REQUIRE_ALL_TOOLS: 1
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: macos-13
-            msys2: false
           - name: dist-apple-various
             env:
               SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -417,7 +377,6 @@ jobs:
               NO_DEBUG_ASSERTIONS: 1
               NO_OVERFLOW_CHECKS: 1
             os: macos-13
-            msys2: false
           - name: x86_64-apple-1
             env:
               SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"
@@ -429,7 +388,6 @@ jobs:
               NO_DEBUG_ASSERTIONS: 1
               NO_OVERFLOW_CHECKS: 1
             os: macos-13
-            msys2: false
           - name: x86_64-apple-2
             env:
               SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -441,7 +399,6 @@ jobs:
               NO_DEBUG_ASSERTIONS: 1
               NO_OVERFLOW_CHECKS: 1
             os: macos-13
-            msys2: false
           - name: dist-aarch64-apple
             env:
               SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -457,19 +414,16 @@ jobs:
               DIST_REQUIRE_ALL_TOOLS: 1
               JEMALLOC_SYS_WITH_LG_PAGE: 14
             os: macos-13
-            msys2: false
           - name: x86_64-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
               SCRIPT: make ci-msvc
             os: windows-2019-8core-32gb
-            msys2: false
           - name: i686-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
               SCRIPT: make ci-msvc
             os: windows-2019-8core-32gb
-            msys2: false
           - name: x86_64-msvc-ext
             env:
               SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
@@ -477,7 +431,6 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json"
               DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
             os: windows-2019-8core-32gb
-            msys2: false
           - name: i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
@@ -485,7 +438,6 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
-            msys2: false
           - name: x86_64-mingw
             env:
               SCRIPT: make ci-mingw
@@ -493,28 +445,24 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
-            msys2: false
           - name: dist-x86_64-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler"
               SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
-            msys2: false
           - name: dist-i686-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
-            msys2: false
           - name: dist-aarch64-msvc
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
-            msys2: false
           - name: dist-i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
@@ -523,7 +471,6 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
-            msys2: false
           - name: dist-x86_64-mingw
             env:
               SCRIPT: python x.py dist bootstrap --include-default-paths
@@ -532,13 +479,11 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
-            msys2: false
           - name: dist-x86_64-msvc-alt
             env:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
               SCRIPT: python x.py dist bootstrap --include-default-paths
             os: windows-2019-8core-32gb
-            msys2: false
     defaults:
       run:
         shell: "${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}"
@@ -674,7 +619,6 @@ jobs:
             env:
               CODEGEN_BACKENDS: "llvm,cranelift"
             os: ubuntu-20.04-16core-64gb
-            msys2: false
     defaults:
       run:
         shell: "${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}"
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 450dcaa18e3db..84eee0c8e4d67 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -74,7 +74,7 @@ x--expand-yaml-anchors--remove:
 
   - &base-job
     env: {}
-    msys2: false
+    #msys2: false
 
   - &job-linux-4c
     os: ubuntu-20.04-4core-16gb
@@ -414,14 +414,14 @@ jobs:
             <<: *job-windows-8c
 
           - name: x86_64-gnu
-            msys2: false
+            #msys2: false
             <<: *job-linux-4c
           
           - name: x86_64-msvc
             env:
               RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
               SCRIPT: make ci-msvc
-            msys2: false
+            #msys2: false
             <<: *job-windows-8c
 
   auto:

From 9e7c04844a5acd72b9cf9fe9bf50fc9ce7936516 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 4 Jan 2024 10:51:53 +0000
Subject: [PATCH 087/168] .

---
 .github/workflows/ci.yml     | 19 +++++++++----------
 src/ci/github-actions/ci.yml | 12 +++---------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb8e2c0b95255..e59a88e55ece3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,7 +58,6 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
-            msys2: true
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
@@ -66,7 +65,6 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
-            msys2: true
             os: windows-2019-8core-32gb
           - name: dist-i686-mingw
             env:
@@ -76,7 +74,6 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
               MSYSTEM: MINGW32
-            msys2: true
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
             env:
@@ -85,7 +82,6 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
-            msys2: true
             os: windows-2019-8core-32gb
           - name: x86_64-gnu
             os: ubuntu-20.04-4core-16gb
@@ -97,11 +93,12 @@ jobs:
             os: windows-2019-8core-32gb
     defaults:
       run:
-        shell: "${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}"
+        shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
+      - if: "contains(matrix.os, 'windows')"
+        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
           msystem: MINGW64
           update: false
@@ -486,11 +483,12 @@ jobs:
             os: windows-2019-8core-32gb
     defaults:
       run:
-        shell: "${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}"
+        shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
+      - if: "contains(matrix.os, 'windows')"
+        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
           msystem: MINGW64
           update: false
@@ -621,11 +619,12 @@ jobs:
             os: ubuntu-20.04-16core-64gb
     defaults:
       run:
-        shell: "${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}"
+        shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
+      - if: "contains(matrix.os, 'windows')"
+        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
           msystem: MINGW64
           update: false
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 84eee0c8e4d67..04f3f5da56e5f 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -74,7 +74,6 @@ x--expand-yaml-anchors--remove:
 
   - &base-job
     env: {}
-    #msys2: false
 
   - &job-linux-4c
     os: ubuntu-20.04-4core-16gb
@@ -113,13 +112,14 @@ x--expand-yaml-anchors--remove:
   - &base-ci-job
     defaults:
       run:
-        shell: ${{ matrix.msys2 && 'msys2 {0}' || 'bash' }}
+        shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     env:
       <<: *shared-ci-variables
     steps:
-      - uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
+      - if: contains(matrix.os, 'windows')
+        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
         with:
           msystem: MINGW64
           # don't try to download package updates from the network
@@ -366,7 +366,6 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               MSYSTEM: MINGW32
-            msys2: true
             <<: *job-windows-8c
 
           - name: x86_64-mingw
@@ -379,7 +378,6 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
-            msys2: true
             <<: *job-windows-8c
           
           - name: dist-i686-mingw
@@ -395,7 +393,6 @@ jobs:
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
               MSYSTEM: MINGW32
-            msys2: true
             <<: *job-windows-8c
 
           - name: dist-x86_64-mingw
@@ -410,18 +407,15 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
-            msys2: true
             <<: *job-windows-8c
 
           - name: x86_64-gnu
-            #msys2: false
             <<: *job-linux-4c
           
           - name: x86_64-msvc
             env:
               RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
               SCRIPT: make ci-msvc
-            #msys2: false
             <<: *job-windows-8c
 
   auto:

From bb0e91f3e8e43d5ba52627b437cc098e06ef42f0 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 5 Jan 2024 17:14:02 +0000
Subject: [PATCH 088/168] .

---
 src/ci/scripts/disable-git-crlf-conversion.sh | 12 +++----
 src/ci/scripts/install-mingw.sh               | 32 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/ci/scripts/disable-git-crlf-conversion.sh b/src/ci/scripts/disable-git-crlf-conversion.sh
index 21e7dd2ec8e4a..5ee702160509a 100755
--- a/src/ci/scripts/disable-git-crlf-conversion.sh
+++ b/src/ci/scripts/disable-git-crlf-conversion.sh
@@ -10,12 +10,12 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-echo MAJAHA
-which which
-which cygpath
-cygpath -w /
-echo MAJAHA2
-ls /
+# echo MAJAHA
+# which which
+# which cygpath
+# cygpath -w /
+# echo MAJAHA2
+# ls /
 # mkdir /home/runneradmin
 # ls /home/
 
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index eeeba6a48819b..8f1a6021c9a86 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -13,14 +13,14 @@ MINGW_ARCHIVE_32="i686-12.2.0-release-posix-dwarf-rt_v10-rev0.7z"
 MINGW_ARCHIVE_64="x86_64-12.2.0-release-posix-seh-rt_v10-rev0.7z"
 
 if isWindows; then
-    echo "Path of / : $(cygpath -w /)"
-    echo "PATH: $PATH"
-    echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
-    echo "MSYSTEM: ${MSYSTEM-unset}"
-    echo "MAJAHA 3: $(cygpath -w $(which git))"
-    echo "MAJAHA 3: $(cygpath -w $(which python))"
-    echo "GITHUB_PATH: $GITHUB_PATH"
-    cat "$GITHUB_PATH"
+    # echo "Path of / : $(cygpath -w /)"
+    # echo "PATH: $PATH"
+    # echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
+    # echo "MSYSTEM: ${MSYSTEM-unset}"
+    # echo "MAJAHA 3: $(cygpath -w $(which git))"
+    # echo "MAJAHA 3: $(cygpath -w $(which python))"
+    # echo "GITHUB_PATH: $GITHUB_PATH"
+    # cat "$GITHUB_PATH"
     case "${CI_JOB_NAME}" in
         *i686*)
             bits=32
@@ -48,7 +48,7 @@ if isWindows; then
 
     if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
         echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
-        pacman -Qg mingw-w64-x86_64-toolchain
+        pacman -Qg mingw-w64-x86_64-toolchain # this gets run even for msvc jobs
         pacman -Syu --noconfirm
         pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
             mingw-w64-$arch-gcc \
@@ -63,14 +63,14 @@ if isWindows; then
         curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" # This doesn't seem to include python. Should install in msys2 step instead?
         7z x -y mingw.7z > /dev/null
         ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
-        echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
+        # echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
     fi
-    echo "MAJAHA 4: $(cygpath -w $(which git))"
-    echo "MAJAHA 4: $(cygpath -w $(which python))"
-    echo "MAJAHA 4: $(cygpath -w $(which gcc))"
-    echo "LS: $(ls)"
-    echo "GITHUB_PATH: $GITHUB_PATH"
-    cat "$GITHUB_PATH"
+    # echo "MAJAHA 4: $(cygpath -w $(which git))"
+    # echo "MAJAHA 4: $(cygpath -w $(which python))"
+    # echo "MAJAHA 4: $(cygpath -w $(which gcc))"
+    # echo "LS: $(ls)"
+    # echo "GITHUB_PATH: $GITHUB_PATH"
+    # cat "$GITHUB_PATH"
     # echo "MAJAHA /etc/pacman.conf"
     # cat /etc/pacman.conf
     # echo "\n"

From bed311bed0115fa468ee971cef6033a25c95592c Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 5 Jan 2024 18:00:26 +0000
Subject: [PATCH 089/168] .

---
 src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
index 9025e9bb0a3af..3f1637f523965 100644
--- a/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
@@ -27,4 +27,4 @@ ENV RUST_CONFIGURE_ARGS \
  --enable-sanitizers \
  --enable-profiler \
  --enable-compiler-docs
-ENV SCRIPT python3 ../x.py --stage 2 test
+ENV SCRIPT python3 ../x.py --stage 2 test --skip tidy

From 3b0f94bbda4afaced029b7b7623e2c43a48a4120 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 6 Jan 2024 09:15:37 +0000
Subject: [PATCH 090/168] .

---
 src/ci/scripts/install-mingw.sh | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 8f1a6021c9a86..fe7d5c33519e9 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -46,25 +46,25 @@ if isWindows; then
             ;;
     esac
 
-    if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
-        echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
-        pacman -Qg mingw-w64-x86_64-toolchain # this gets run even for msvc jobs
-        pacman -Syu --noconfirm
-        pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
-            mingw-w64-$arch-gcc \
-            mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
-        #ciCommandAddPath "/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
-        echo "CUSTOM MINGW PATH 0: /mingw${bits}/bin | $(cygpath -w "/mingw${bits}/bin")"
-        echo "2pacman -Qg mingw-w64-x86_64-toolchain:"
-        pacman -Qg mingw-w64-x86_64-toolchain
-    else
-        mingw_dir="mingw${bits}"
+    # if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
+    #     echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
+    #     pacman -Qg mingw-w64-x86_64-toolchain # this gets run even for msvc jobs, checks if the package (group) is installed
+    #     pacman -Syu --noconfirm
+    #     pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
+    #         mingw-w64-$arch-gcc \
+    #         mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
+    #     #ciCommandAddPath "/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
+    #     echo "CUSTOM MINGW PATH 0: /mingw${bits}/bin | $(cygpath -w "/mingw${bits}/bin")"
+    #     echo "2pacman -Qg mingw-w64-x86_64-toolchain:"
+    #     pacman -Qg mingw-w64-x86_64-toolchain
+    # else
+    #     mingw_dir="mingw${bits}"
 
-        curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" # This doesn't seem to include python. Should install in msys2 step instead?
-        7z x -y mingw.7z > /dev/null
-        ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
-        # echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
-    fi
+    #     curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" # This doesn't seem to include python. Should install in msys2 step instead?
+    #     7z x -y mingw.7z > /dev/null
+    #     ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
+    #     # echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
+    # fi
     # echo "MAJAHA 4: $(cygpath -w $(which git))"
     # echo "MAJAHA 4: $(cygpath -w $(which python))"
     # echo "MAJAHA 4: $(cygpath -w $(which gcc))"

From e37d549b6339faceeee14b19fc131d303acec3ff Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 6 Jan 2024 10:23:54 +0000
Subject: [PATCH 091/168] .

---
 .github/workflows/ci.yml        | 11 ++++++-----
 src/ci/github-actions/ci.yml    |  5 ++---
 src/ci/scripts/install-mingw.sh |  3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e59a88e55ece3..28ac2b6760e04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,7 +57,6 @@ jobs:
               SCRIPT: make ci-mingw
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
-              MSYSTEM: MINGW32
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
@@ -73,7 +72,6 @@ jobs:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
-              MSYSTEM: MINGW32
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
             env:
@@ -100,11 +98,12 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: MINGW64
+          msystem: "${{ contains(matrix.name, x86_64) && 'mingw64' || 'mingw32' }}"
           update: false
           release: true
           path-type: inherit
           install: "make git\n"
+          pacboy: "toolchain:p"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,11 +489,12 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: MINGW64
+          msystem: "${{ contains(matrix.name, x86_64) && 'mingw64' || 'mingw32' }}"
           update: false
           release: true
           path-type: inherit
           install: "make git\n"
+          pacboy: "toolchain:p"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,11 +626,12 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: MINGW64
+          msystem: "${{ contains(matrix.name, x86_64) && 'mingw64' || 'mingw32' }}"
           update: false
           release: true
           path-type: inherit
           install: "make git\n"
+          pacboy: "toolchain:p"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 04f3f5da56e5f..8b4e5b9bd0a18 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -121,7 +121,7 @@ x--expand-yaml-anchors--remove:
       - if: contains(matrix.os, 'windows')
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
         with:
-          msystem: MINGW64
+          msystem: ${{ contains(matrix.name, x86_64) && 'mingw64' || 'mingw32' }}
           # don't try to download package updates from the network
           update: false
           # don't try to use the msys that comes built-in to the github runner,
@@ -133,6 +133,7 @@ x--expand-yaml-anchors--remove:
           install: >
             make
             git
+          pacboy: toolchain:p
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq
           #   mingw-w64-x86_64-7zip
@@ -365,7 +366,6 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
-              MSYSTEM: MINGW32
             <<: *job-windows-8c
 
           - name: x86_64-mingw
@@ -392,7 +392,6 @@ jobs:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
-              MSYSTEM: MINGW32
             <<: *job-windows-8c
 
           - name: dist-x86_64-mingw
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index fe7d5c33519e9..a0486c4d45427 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -48,7 +48,8 @@ if isWindows; then
 
     # if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
     #     echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
-    #     pacman -Qg mingw-w64-x86_64-toolchain # this gets run even for msvc jobs, checks if the package (group) is installed
+    #     pacman -Qg mingw-w64-x86_64-toolchain # this gets run even for msvc jobs,
+    #     # checks if the package (group) is installed
     #     pacman -Syu --noconfirm
     #     pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
     #         mingw-w64-$arch-gcc \

From 7c95ab5a8678f972c5088a2e3c5a5c1725f62489 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 6 Jan 2024 10:46:45 +0000
Subject: [PATCH 092/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28ac2b6760e04..b08311a2e8dae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,7 +98,7 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, x86_64) && 'mingw64' || 'mingw32' }}"
+          msystem: "${{ contains(matrix.name, 'x86_64') && 'mingw64' || 'mingw32' }}"
           update: false
           release: true
           path-type: inherit
@@ -489,7 +489,7 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, x86_64) && 'mingw64' || 'mingw32' }}"
+          msystem: "${{ contains(matrix.name, 'x86_64') && 'mingw64' || 'mingw32' }}"
           update: false
           release: true
           path-type: inherit
@@ -626,7 +626,7 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, x86_64) && 'mingw64' || 'mingw32' }}"
+          msystem: "${{ contains(matrix.name, 'x86_64') && 'mingw64' || 'mingw32' }}"
           update: false
           release: true
           path-type: inherit
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 8b4e5b9bd0a18..32d921c886861 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -121,7 +121,7 @@ x--expand-yaml-anchors--remove:
       - if: contains(matrix.os, 'windows')
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
         with:
-          msystem: ${{ contains(matrix.name, x86_64) && 'mingw64' || 'mingw32' }}
+          msystem: ${{ contains(matrix.name, 'x86_64') && 'mingw64' || 'mingw32' }}
           # don't try to download package updates from the network
           update: false
           # don't try to use the msys that comes built-in to the github runner,

From 9d1454352aa82abd145349009077a218d646453d Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 6 Jan 2024 14:22:00 +0000
Subject: [PATCH 093/168] .

---
 .github/workflows/ci.yml        | 6 +++---
 src/ci/github-actions/ci.yml    | 6 +++++-
 src/ci/scripts/install-mingw.sh | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b08311a2e8dae..3048863d4c62a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "toolchain:p"
+          pacboy: "toolchain:p cmake:p gcc:p python:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -494,7 +494,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "toolchain:p"
+          pacboy: "toolchain:p cmake:p gcc:p python:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -631,7 +631,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "toolchain:p"
+          pacboy: "toolchain:p cmake:p gcc:p python:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 32d921c886861..1ce5c335c2615 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -133,7 +133,11 @@ x--expand-yaml-anchors--remove:
           install: >
             make
             git
-          pacboy: toolchain:p
+          pacboy: >
+            toolchain:p
+            cmake:p
+            gcc:p
+            python:p
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq
           #   mingw-w64-x86_64-7zip
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index a0486c4d45427..2a1a45cc43809 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -33,7 +33,7 @@ if isWindows; then
             mingw_archive="${MINGW_ARCHIVE_64}"
             ;;
         *aarch64*)
-            # aarch64 is a cross-compiled target. Use the x86_64
+            # aarch64 is a cross-compiled target. Use the x86_64 #NOTE check msystem variable CI
             # mingw, since that's the host architecture.
             bits=64
             arch=x86_64

From d539efce1d26648ac7b9f525b6f3138ff02af014 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 6 Jan 2024 18:50:30 +0000
Subject: [PATCH 094/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3048863d4c62a..557c20a73f1c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "toolchain:p cmake:p gcc:p python:p\n"
+          pacboy: "toolchain:p cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -494,7 +494,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "toolchain:p cmake:p gcc:p python:p\n"
+          pacboy: "toolchain:p cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -631,7 +631,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "toolchain:p cmake:p gcc:p python:p\n"
+          pacboy: "toolchain:p cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 1ce5c335c2615..16ece104e3713 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -137,7 +137,7 @@ x--expand-yaml-anchors--remove:
             toolchain:p
             cmake:p
             gcc:p
-            python:p
+          #python:p
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq
           #   mingw-w64-x86_64-7zip

From ada50638aeb237a110ffe02914deb0e1e293c092 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 6 Jan 2024 19:26:46 +0000
Subject: [PATCH 095/168] .

---
 src/ci/scripts/install-mingw.sh | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 2a1a45cc43809..38ea4c38271b3 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -46,26 +46,26 @@ if isWindows; then
             ;;
     esac
 
-    # if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
-    #     echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
-    #     pacman -Qg mingw-w64-x86_64-toolchain # this gets run even for msvc jobs,
-    #     # checks if the package (group) is installed
-    #     pacman -Syu --noconfirm
-    #     pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
-    #         mingw-w64-$arch-gcc \
-    #         mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
-    #     #ciCommandAddPath "/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
-    #     echo "CUSTOM MINGW PATH 0: /mingw${bits}/bin | $(cygpath -w "/mingw${bits}/bin")"
-    #     echo "2pacman -Qg mingw-w64-x86_64-toolchain:"
-    #     pacman -Qg mingw-w64-x86_64-toolchain
-    # else
-    #     mingw_dir="mingw${bits}"
+    if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
+        # echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
+        # pacman -Qg mingw-w64-x86_64-toolchain # this gets run even for msvc jobs,
+        # # checks if the package (group) is installed
+        # pacman -Syu --noconfirm
+        # pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
+        #     mingw-w64-$arch-gcc \
+        #     mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
+        # #ciCommandAddPath "/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
+        # echo "CUSTOM MINGW PATH 0: /mingw${bits}/bin | $(cygpath -w "/mingw${bits}/bin")"
+        # echo "2pacman -Qg mingw-w64-x86_64-toolchain:"
+        # pacman -Qg mingw-w64-x86_64-toolchain
+    else
+        mingw_dir="mingw${bits}"
 
-    #     curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" # This doesn't seem to include python. Should install in msys2 step instead?
-    #     7z x -y mingw.7z > /dev/null
-    #     ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
-    #     # echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
-    # fi
+        curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" # This doesn't seem to include python. Should install in msys2 step instead?
+        7z x -y mingw.7z > /dev/null
+        ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
+        # echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
+    fi
     # echo "MAJAHA 4: $(cygpath -w $(which git))"
     # echo "MAJAHA 4: $(cygpath -w $(which python))"
     # echo "MAJAHA 4: $(cygpath -w $(which gcc))"

From fd31da5a2716f7e44b9b0ad4307fdc3dd082ad33 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 6 Jan 2024 19:35:29 +0000
Subject: [PATCH 096/168] .

---
 src/ci/scripts/install-mingw.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 38ea4c38271b3..4c02038533515 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -47,7 +47,7 @@ if isWindows; then
     esac
 
     if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
-        # echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
+        echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
         # pacman -Qg mingw-w64-x86_64-toolchain # this gets run even for msvc jobs,
         # # checks if the package (group) is installed
         # pacman -Syu --noconfirm

From 74f5141adbb2bca20a0477aae77166fe46d4111e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 6 Jan 2024 23:42:12 +0000
Subject: [PATCH 097/168] .

---
 .github/workflows/ci.yml     | 3 ---
 src/ci/github-actions/ci.yml | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 557c20a73f1c6..de3723391ed01 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "toolchain:p cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -494,7 +493,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "toolchain:p cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -631,7 +629,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "toolchain:p cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 16ece104e3713..a9ad02908f034 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -133,10 +133,10 @@ x--expand-yaml-anchors--remove:
           install: >
             make
             git
-          pacboy: >
-            toolchain:p
-            cmake:p
-            gcc:p
+          # pacboy: >
+          #   toolchain:p
+          #   cmake:p
+          #   gcc:p
           #python:p
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq

From 83a4c134aa4323998750b6fd1c7cc9f9475a6329 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 7 Jan 2024 11:25:40 +0000
Subject: [PATCH 098/168] .

---
 src/ci/scripts/install-mingw.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 4c02038533515..ae308a1a64a89 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -53,18 +53,21 @@ if isWindows; then
         # pacman -Syu --noconfirm
         # pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
         #     mingw-w64-$arch-gcc \
-        #     mingw-w64-$arch-python # the python package is actually for python3 #suspect, is this python even used?
-        # #ciCommandAddPath "/mingw${bits}/bin" # alternatively, could maybe run bash without --noprofile and --norc in ci.yml
+        #     mingw-w64-$arch-python
+        # ^the python package is actually for python3 #suspect, is this python even used?
+        # #ciCommandAddPath "/mingw${bits}/bin"
+        # ^alternatively, could maybe run bash without --noprofile and --norc in ci.yml
         # echo "CUSTOM MINGW PATH 0: /mingw${bits}/bin | $(cygpath -w "/mingw${bits}/bin")"
         # echo "2pacman -Qg mingw-w64-x86_64-toolchain:"
         # pacman -Qg mingw-w64-x86_64-toolchain
     else
         mingw_dir="mingw${bits}"
 
-        curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" # This doesn't seem to include python. Should install in msys2 step instead?
+        curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
+        # ^This doesn't seem to include python. Should install in msys2 step instead?
         7z x -y mingw.7z > /dev/null
         ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
-        # echo "CUSTOM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
+        #echo "CUSTM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
     fi
     # echo "MAJAHA 4: $(cygpath -w $(which git))"
     # echo "MAJAHA 4: $(cygpath -w $(which python))"

From b43efd932fcd7ee64fc168f50f566aee5984724f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 11 Jan 2024 20:44:41 +0000
Subject: [PATCH 099/168] .

---
 src/ci/scripts/install-msys2.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 3a806b373df98..1915153d1a8b2 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -17,7 +17,8 @@ if isWindows; then
     echo "MAJAHA 1: $(cygpath -w $(which git))"
     msys2Path="c:/msys64"
     mkdir -p "${msys2Path}/home/${USERNAME}"
-    #ciCommandAddPath "${msys2Path}/usr/bin" # This is what rotates the CI shell from Git bash to msys bash i think
+    #ciCommandAddPath "${msys2Path}/usr/bin"
+    #^ This is what rotates the CI shell from Git bash to msys bash i think
     echo "MAJAHA 2: $(cygpath -w $(which git))"
     echo "GITHUB_PATH: $GITHUB_PATH"
     cat "$GITHUB_PATH"

From 134f31c0ef900c11c53db8d6c9507200647063f5 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 12 Jan 2024 17:20:37 +0000
Subject: [PATCH 100/168] .

---
 .github/workflows/ci.yml     | 4 ----
 src/ci/github-actions/ci.yml | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de3723391ed01..08b9ac70ce7c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,21 +56,18 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
               SCRIPT: make ci-mingw
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
               SCRIPT: make ci-mingw
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
           - name: dist-i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
               SCRIPT: python x.py dist bootstrap --include-default-paths
-              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
@@ -78,7 +75,6 @@ jobs:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             os: windows-2019-8core-32gb
           - name: x86_64-gnu
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index a9ad02908f034..1a081ac9c2f43 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -369,7 +369,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
+              #CUSTOM_MINGW: 1
             <<: *job-windows-8c
 
           - name: x86_64-mingw
@@ -381,7 +381,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
+              #CUSTOM_MINGW: 1
             <<: *job-windows-8c
           
           - name: dist-i686-mingw
@@ -394,7 +394,7 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               SCRIPT: python x.py dist bootstrap --include-default-paths
-              CUSTOM_MINGW: 1
+              #CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             <<: *job-windows-8c
 
@@ -408,7 +408,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              CUSTOM_MINGW: 1
+              #CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
             <<: *job-windows-8c
 

From d601af590513b3fb7de367e42802be9299fba26f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 12 Jan 2024 18:39:33 +0000
Subject: [PATCH 101/168] .

---
 src/ci/scripts/install-mingw.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index ae308a1a64a89..18793c3363960 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -72,6 +72,7 @@ if isWindows; then
     # echo "MAJAHA 4: $(cygpath -w $(which git))"
     # echo "MAJAHA 4: $(cygpath -w $(which python))"
     # echo "MAJAHA 4: $(cygpath -w $(which gcc))"
+    echo "MAJAHA cmake: $(cygpath -w $(which cmake))"
     # echo "LS: $(ls)"
     # echo "GITHUB_PATH: $GITHUB_PATH"
     # cat "$GITHUB_PATH"

From 00fe60999b4a1db6ca447bb27bfa9cbc36352c84 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 12 Jan 2024 19:15:28 +0000
Subject: [PATCH 102/168] .

---
 .github/workflows/ci.yml     | 3 +++
 src/ci/github-actions/ci.yml | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 08b9ac70ce7c1..c534323921f98 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,6 +99,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
+          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -489,6 +490,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
+          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -625,6 +627,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git\n"
+          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 1a081ac9c2f43..6dcaf88e74a0e 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -133,9 +133,9 @@ x--expand-yaml-anchors--remove:
           install: >
             make
             git
-          # pacboy: >
+          pacboy: >
+            cmake:p
           #   toolchain:p
-          #   cmake:p
           #   gcc:p
           #python:p
           #   mingw-w64-x86_64-python

From d0cdd746114208416e8031b9d9fb30aada49944e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 12 Jan 2024 20:10:52 +0000
Subject: [PATCH 103/168] .

---
 .github/workflows/ci.yml     | 12 ++++++------
 src/ci/github-actions/ci.yml |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c534323921f98..28a962e147e15 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,12 +94,12 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, 'x86_64') && 'mingw64' || 'mingw32' }}"
+          msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "cmake:p\n"
+          pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -485,12 +485,12 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, 'x86_64') && 'mingw64' || 'mingw32' }}"
+          msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "cmake:p\n"
+          pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -622,12 +622,12 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, 'x86_64') && 'mingw64' || 'mingw32' }}"
+          msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
           path-type: inherit
           install: "make git\n"
-          pacboy: "cmake:p\n"
+          pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 6dcaf88e74a0e..754c0b2c4f7d0 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -121,7 +121,8 @@ x--expand-yaml-anchors--remove:
       - if: contains(matrix.os, 'windows')
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
         with:
-          msystem: ${{ contains(matrix.name, 'x86_64') && 'mingw64' || 'mingw32' }}
+          # i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64.
+          msystem: ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}
           # don't try to download package updates from the network
           update: false
           # don't try to use the msys that comes built-in to the github runner,
@@ -135,8 +136,8 @@ x--expand-yaml-anchors--remove:
             git
           pacboy: >
             cmake:p
+            gcc:p
           #   toolchain:p
-          #   gcc:p
           #python:p
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq

From bbc7d47f72691255592519fda5b89383903ad252 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 13 Jan 2024 01:30:29 +0000
Subject: [PATCH 104/168] .

---
 src/ci/scripts/install-msys2.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 1915153d1a8b2..e3c39485b8d92 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -12,6 +12,10 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 if isWindows; then
     echo "Path of / : $(cygpath -w /)"
     echo "PATH: $PATH"
+    echo "##### /mingw64/bin"
+    ls /mingw64/bin
+    echo "##### /bin"
+    ls /bin
     echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
     echo "MSYSTEM: ${MSYSTEM-unset}"
     echo "MAJAHA 1: $(cygpath -w $(which git))"

From 0a6da3c714044662763d9380308627b9170a41c1 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 13 Jan 2024 02:04:57 +0000
Subject: [PATCH 105/168] .

---
 src/bootstrap/src/utils/cc_detect.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
index fb5b9d8c88f7d..11207847badfb 100644
--- a/src/bootstrap/src/utils/cc_detect.rs
+++ b/src/bootstrap/src/utils/cc_detect.rs
@@ -111,10 +111,14 @@ pub fn find_target(build: &Build, target: TargetSelection) {
         .and_then(|c| c.cc.clone())
         .or_else(|| default_compiler(&mut cfg, Language::C, target, build))
     {
+        println!("MAJAHA FIND_TARGET 1");
         cfg.compiler(cc);
+    } else {
+        println!("MAJAHA FIND_TARGET 2");
     }
 
     let compiler = cfg.get_compiler();
+    dbg!(compiler.path());
     let ar = if let ar @ Some(..) = config.and_then(|c| c.ar.clone()) {
         ar
     } else {

From ac7c3ed311c09b07e2cfe1b2a8758393d979c2bf Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 13 Jan 2024 02:33:49 +0000
Subject: [PATCH 106/168] .

---
 src/bootstrap/src/core/build_steps/llvm.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
index 4b2d3e9ab4b75..087720efa417b 100644
--- a/src/bootstrap/src/core/build_steps/llvm.rs
+++ b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -662,9 +662,12 @@ fn configure_cmake(
         Some(ref cl) => (cl.into(), cl.into()),
         None => (builder.cc(target), builder.cxx(target).unwrap()),
     };
+    dbg!(builder.config.llvm_clang_cl);
+    dbg!(cc);
 
     // Handle msvc + ninja + ccache specially (this is what the bots use)
     if target.is_msvc() && builder.ninja() && builder.config.ccache.is_some() {
+        println!("Path A");
         let mut wrap_cc = env::current_exe().expect("failed to get cwd");
         wrap_cc.set_file_name("sccache-plus-cl.exe");
 
@@ -702,6 +705,7 @@ fn configure_cmake(
             cfg.env("SCCACHE_EXTRA_ARGS", "-m32");
         }
     } else {
+        println!("Path B");
         // If ccache is configured we inform the build a little differently how
         // to invoke ccache while also invoking our compilers.
         if use_compiler_launcher {

From 667c5254ee4ca7c1ebbdd0454a91c8b0eb087dd3 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 13 Jan 2024 13:31:14 +0000
Subject: [PATCH 107/168] .

---
 src/bootstrap/src/core/build_steps/llvm.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
index 087720efa417b..b50fbbcba5f96 100644
--- a/src/bootstrap/src/core/build_steps/llvm.rs
+++ b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -662,8 +662,8 @@ fn configure_cmake(
         Some(ref cl) => (cl.into(), cl.into()),
         None => (builder.cc(target), builder.cxx(target).unwrap()),
     };
-    dbg!(builder.config.llvm_clang_cl);
-    dbg!(cc);
+    dbg!(&builder.config.llvm_clang_cl);
+    dbg!(&cc);
 
     // Handle msvc + ninja + ccache specially (this is what the bots use)
     if target.is_msvc() && builder.ninja() && builder.config.ccache.is_some() {

From 725699288d32b9abb13ab21eecd3e4d82448c403 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 13 Jan 2024 15:43:19 +0000
Subject: [PATCH 108/168] .

---
 src/ci/scripts/install-clang.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh
index 77164ed4117a9..404cece6fac67 100755
--- a/src/ci/scripts/install-clang.sh
+++ b/src/ci/scripts/install-clang.sh
@@ -38,6 +38,9 @@ if isMacOS; then
     # `clang-ar` by accident.
     ciCommandSetEnv AR "ar"
 elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
+    # This seems to contradict what's going on in install-mingw.sh.
+    # if CUSTOM_MINGW ins't set, that script installs mingw, but this script
+    # ensure's it isn't used! (to compile llvm, anyway)
 
     # If we're compiling for MSVC then we, like most other distribution builders,
     # switch to clang as the compiler. This'll allow us eventually to enable LTO
@@ -49,13 +52,13 @@ elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
     # don't want to run the installer directly; extracting it is more reliable
     # in CI environments.
 
-    mkdir -p citools/clang-rust
-    cd citools
-    retry curl -f "${MIRRORS_BASE}/LLVM-${LLVM_VERSION}-win64.exe" \
-        -o "LLVM-${LLVM_VERSION}-win64.exe"
-    7z x -oclang-rust/ "LLVM-${LLVM_VERSION}-win64.exe"
-    ciCommandSetEnv RUST_CONFIGURE_ARGS \
-        "${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"
+    # mkdir -p citools/clang-rust
+    # cd citools
+    # retry curl -f "${MIRRORS_BASE}/LLVM-${LLVM_VERSION}-win64.exe" \
+    #     -o "LLVM-${LLVM_VERSION}-win64.exe"
+    # 7z x -oclang-rust/ "LLVM-${LLVM_VERSION}-win64.exe"
+    # ciCommandSetEnv RUST_CONFIGURE_ARGS \
+    #     "${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"
 
     # Disable downloading CI LLVM on this builder;
     # setting up clang-cl just above conflicts with the default if-unchanged option.
@@ -65,5 +68,5 @@ fi
 if isWindows; then
     # GitHub image 20210928.2 added LLVM, but it is broken (and we don't want
     # to use it anyways).
-    rm -rf /c/Program\ Files/LLVM
+    rm -rf /c/Program\ Files/LLVM # interesting, should do with Git etc?
 fi

From 3d8d5adb4fa9d1e49265025db868263394059dc3 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 13 Jan 2024 22:47:38 +0000
Subject: [PATCH 109/168] .

---
 src/ci/scripts/install-msys2.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index e3c39485b8d92..4766750ebd20d 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -49,4 +49,15 @@ if isWindows; then
     echo "LS: $(ls)"
     echo "GITHUB_PATH: $GITHUB_PATH"
     cat "$GITHUB_PATH"
+
+    # Delete these pre-installed tools because we are using the MSYS2 setup action versions
+    # instead, so we can't accidentally use them.
+    # Delete Windows-Git
+    rm -r "/c/Program Files/Git/"
+    # Delete pre-installed version of MSYS2
+    rm -r "/c/msys64"
+    # wtf why is this even here??
+    rm -r "/c/mingw64"
+    echo "#### LS OF C DRIVE:"
+    ls /c/
 fi

From 89a0fa3ac7c11ac6bfca5cf6da5ceebe078e5dfa Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 13 Jan 2024 23:30:34 +0000
Subject: [PATCH 110/168] .

---
 .github/workflows/ci.yml        |  6 +++---
 src/ci/github-actions/ci.yml    |  2 +-
 src/ci/scripts/install-msys2.sh | 11 +++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28a962e147e15..fe17bf5cc99c3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,7 +98,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git\n"
+          install: "make git dos2unix\n"
           pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
@@ -489,7 +489,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git\n"
+          install: "make git dos2unix\n"
           pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
@@ -626,7 +626,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git\n"
+          install: "make git dos2unix\n"
           pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 754c0b2c4f7d0..a297f8423c0c8 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -134,6 +134,7 @@ x--expand-yaml-anchors--remove:
           install: >
             make
             git
+            dos2unix
           pacboy: >
             cmake:p
             gcc:p
@@ -142,7 +143,6 @@ x--expand-yaml-anchors--remove:
           #   mingw-w64-x86_64-python
           #   mingw-w64-x86_64-jq
           #   mingw-w64-x86_64-7zip
-          #   dos2unix
           #   mingw-w64-x86_64-toolchain
           #   mingw-w64-i686-toolchain
           #   mingw-w64-x86_64-cmake
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 4766750ebd20d..8232e5163c735 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -50,6 +50,15 @@ if isWindows; then
     echo "GITHUB_PATH: $GITHUB_PATH"
     cat "$GITHUB_PATH"
 
+    echo "#### LS OF C DRIVE: ####"
+    ls /c/
+
+    echo "#### LS OF /c/msys64/bin DRIVE: ####"
+    ls /c/msys64/bin
+
+    echo "#### LS OF /c/mingw64/bin DRIVE: ####"
+    ls /c/mingw64/bin
+
     # Delete these pre-installed tools because we are using the MSYS2 setup action versions
     # instead, so we can't accidentally use them.
     # Delete Windows-Git
@@ -58,6 +67,4 @@ if isWindows; then
     rm -r "/c/msys64"
     # wtf why is this even here??
     rm -r "/c/mingw64"
-    echo "#### LS OF C DRIVE:"
-    ls /c/
 fi

From 95ea8e847c2b10c83fd495abc98599c98ac49f6e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 14 Jan 2024 00:08:31 +0000
Subject: [PATCH 111/168] .

---
 src/ci/scripts/install-msys2.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 8232e5163c735..96cfd3510d90e 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -53,18 +53,19 @@ if isWindows; then
     echo "#### LS OF C DRIVE: ####"
     ls /c/
 
-    echo "#### LS OF /c/msys64/bin DRIVE: ####"
-    ls /c/msys64/bin
+    echo "#### LS OF /c/msys64/bin: ####"
+    ls /c/msys64/
 
-    echo "#### LS OF /c/mingw64/bin DRIVE: ####"
-    ls /c/mingw64/bin
+    echo "#### LS OF /c/mingw64/bin: ####"
+    ls /c/mingw64/bin/
 
     # Delete these pre-installed tools because we are using the MSYS2 setup action versions
     # instead, so we can't accidentally use them.
     # Delete Windows-Git
     rm -r "/c/Program Files/Git/"
     # Delete pre-installed version of MSYS2
-    rm -r "/c/msys64"
+    rm -r "/c/msys64/"
     # wtf why is this even here??
-    rm -r "/c/mingw64"
+    rm -r "/c/mingw64/"
+    rm -r "/c/mingw32/"
 fi

From 6152f2a6c730bde7f6ea693b0da8f12f8e4e7734 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 14 Jan 2024 03:10:07 +0000
Subject: [PATCH 112/168] .

---
 src/ci/scripts/install-msys2.sh      | 4 ++--
 src/tools/compiletest/src/runtest.rs | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 96cfd3510d90e..1bb09f7bf87b2 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -53,10 +53,10 @@ if isWindows; then
     echo "#### LS OF C DRIVE: ####"
     ls /c/
 
-    echo "#### LS OF /c/msys64/bin: ####"
+    echo "#### LS OF /c/msys64/: ####"
     ls /c/msys64/
 
-    echo "#### LS OF /c/mingw64/bin: ####"
+    echo "#### LS OF /c/mingw64/bin/: ####"
     ls /c/mingw64/bin/
 
     # Delete these pre-installed tools because we are using the MSYS2 setup action versions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index ca80328f3ac03..d27d12f6c2fa7 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2266,6 +2266,7 @@ impl<'test> TestCx<'test> {
         let cmdline = {
             let cmdline = self.make_cmdline(&command, lib_path);
             logv(self.config, format!("executing {}", cmdline));
+            println!("executing {}", cmdline);
             cmdline
         };
 

From 57f01ffb8855c092be4a91910bcbd70c579c2f34 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 14 Jan 2024 15:05:14 +0000
Subject: [PATCH 113/168] .

---
 src/ci/scripts/install-msys2.sh      | 2 ++
 src/tools/compiletest/src/runtest.rs | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 1bb09f7bf87b2..027a674ccc6a4 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -65,6 +65,8 @@ if isWindows; then
     rm -r "/c/Program Files/Git/"
     # Delete pre-installed version of MSYS2
     rm -r "/c/msys64/"
+    # Delete Strawberry Perl, which contains a version of mingw
+    rm -r "/c/Strawberry/"
     # wtf why is this even here??
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index d27d12f6c2fa7..ca80328f3ac03 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2266,7 +2266,6 @@ impl<'test> TestCx<'test> {
         let cmdline = {
             let cmdline = self.make_cmdline(&command, lib_path);
             logv(self.config, format!("executing {}", cmdline));
-            println!("executing {}", cmdline);
             cmdline
         };
 

From be14d4a9bf832474c64079deea87a999b2628e81 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 14 Jan 2024 18:47:41 +0000
Subject: [PATCH 114/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe17bf5cc99c3..02f3207e6716e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix\n"
-          pacboy: "cmake:p gcc:p\n"
+          pacboy: "cmake:p gcc:p diffutils:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix\n"
-          pacboy: "cmake:p gcc:p\n"
+          pacboy: "cmake:p gcc:p diffutils:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -627,7 +627,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix\n"
-          pacboy: "cmake:p gcc:p\n"
+          pacboy: "cmake:p gcc:p diffutils:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index a297f8423c0c8..fe1a92a9c90bc 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -138,6 +138,7 @@ x--expand-yaml-anchors--remove:
           pacboy: >
             cmake:p
             gcc:p
+            diffutils:p
           #   toolchain:p
           #python:p
           #   mingw-w64-x86_64-python

From 24c826dda9e82fe89b39cd0ce14e14c3ed3bd676 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 14 Jan 2024 22:30:17 +0000
Subject: [PATCH 115/168] .

---
 .github/workflows/ci.yml     | 12 ++++++------
 src/ci/github-actions/ci.yml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 02f3207e6716e..963634b40cb5f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,8 +98,8 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix\n"
-          pacboy: "cmake:p gcc:p diffutils:p\n"
+          install: "make git dos2unix diffutils\n"
+          pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -489,8 +489,8 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix\n"
-          pacboy: "cmake:p gcc:p diffutils:p\n"
+          install: "make git dos2unix diffutils\n"
+          pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -626,8 +626,8 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix\n"
-          pacboy: "cmake:p gcc:p diffutils:p\n"
+          install: "make git dos2unix diffutils\n"
+          pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index fe1a92a9c90bc..2a5369d58f952 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -135,10 +135,10 @@ x--expand-yaml-anchors--remove:
             make
             git
             dos2unix
+            diffutils
           pacboy: >
             cmake:p
             gcc:p
-            diffutils:p
           #   toolchain:p
           #python:p
           #   mingw-w64-x86_64-python

From 559c57bd7246e230429154b0dff11c2044a283cb Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 15 Jan 2024 02:40:01 +0000
Subject: [PATCH 116/168] .

---
 src/ci/run.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ci/run.sh b/src/ci/run.sh
index dc0d5e02cb1bc..3eb6fd0c34267 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -76,9 +76,12 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set dist.compression-profile=balance
 # the LLVM build, as not to run out of memory.
 # This is an attempt to fix the spurious build error tracked by
 # https://github.com/rust-lang/rust/issues/108227.
-if isWindows && [[ ${CUSTOM_MINGW-0} -eq 1 ]]; then
-    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=1"
-fi
+# if isWindows && [[ ${CUSTOM_MINGW-0} -eq 1 ]]; then
+# should do just on mingw, not "custom mingw". same problem of using "custom mingw"
+# to mean "mingw" as in that other script.
+#https://github.com/rust-lang-ci/rust/commit/b524c6277fd8f6826a97e5b83d397e03ae9c949f
+RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=1"
+# fi
 
 # Only produce xz tarballs on CI. gz tarballs will be generated by the release
 # process by recompressing the existing xz ones. This decreases the storage

From 3ad796a8a407f5f5b16d87daa201000ce1c09afb Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 15 Jan 2024 20:12:26 +0000
Subject: [PATCH 117/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 963634b40cb5f..55f8ae0220e6e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: inherit
+          path-type: strict
           install: "make git dos2unix diffutils\n"
           pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
@@ -488,7 +488,7 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: inherit
+          path-type: strict
           install: "make git dos2unix diffutils\n"
           pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
@@ -625,7 +625,7 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: inherit
+          path-type: strict
           install: "make git dos2unix diffutils\n"
           pacboy: "cmake:p gcc:p\n"
       - name: checkout the source code
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 2a5369d58f952..a754966c954ce 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -130,7 +130,8 @@ x--expand-yaml-anchors--remove:
           release: true
           # Inherit the full path from the windows environment, with msys's */bin/
           # dirs placed in front. This lets us run Windows-native Python etc.
-          path-type: inherit
+          # path-type: inherit
+          path-type: strict
           install: >
             make
             git

From 5dfd344f7e911cce53de67441da346df616a513f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 15 Jan 2024 20:56:26 +0000
Subject: [PATCH 118/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55f8ae0220e6e..710fd6a3d85c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
           release: true
           path-type: strict
           install: "make git dos2unix diffutils\n"
-          pacboy: "cmake:p gcc:p\n"
+          pacboy: "gcc:p cmake:p jq:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
           release: true
           path-type: strict
           install: "make git dos2unix diffutils\n"
-          pacboy: "cmake:p gcc:p\n"
+          pacboy: "gcc:p cmake:p jq:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -627,7 +627,7 @@ jobs:
           release: true
           path-type: strict
           install: "make git dos2unix diffutils\n"
-          pacboy: "cmake:p gcc:p\n"
+          pacboy: "gcc:p cmake:p jq:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index a754966c954ce..3d90bd5e919a6 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -138,8 +138,10 @@ x--expand-yaml-anchors--remove:
             dos2unix
             diffutils
           pacboy: >
-            cmake:p
             gcc:p
+            cmake:p
+            jq:p
+          # should cmake and jq just always be x86_64?
           #   toolchain:p
           #python:p
           #   mingw-w64-x86_64-python

From 40b328e4dacc016bc0770ac8e7ba2e0fff85b222 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 15 Jan 2024 21:21:17 +0000
Subject: [PATCH 119/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 710fd6a3d85c7..07b56a74dc283 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
           release: true
           path-type: strict
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p jq:p\n"
+          pacboy: "gcc:p cmake:p jq:p 7z:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
           release: true
           path-type: strict
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p jq:p\n"
+          pacboy: "gcc:p cmake:p jq:p 7z:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -627,7 +627,7 @@ jobs:
           release: true
           path-type: strict
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p jq:p\n"
+          pacboy: "gcc:p cmake:p jq:p 7z:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 3d90bd5e919a6..4a2908e7ac41a 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -141,6 +141,7 @@ x--expand-yaml-anchors--remove:
             gcc:p
             cmake:p
             jq:p
+            7z:p
           # should cmake and jq just always be x86_64?
           #   toolchain:p
           #python:p

From bce495fbb10ca6ddde9e7761a6c2c26923c74384 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 15 Jan 2024 21:33:43 +0000
Subject: [PATCH 120/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 07b56a74dc283..4448a2c853e42 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
           release: true
           path-type: strict
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p jq:p 7z:p\n"
+          pacboy: "gcc:p cmake:p jq:p 7zip:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
           release: true
           path-type: strict
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p jq:p 7z:p\n"
+          pacboy: "gcc:p cmake:p jq:p 7zip:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -627,7 +627,7 @@ jobs:
           release: true
           path-type: strict
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p jq:p 7z:p\n"
+          pacboy: "gcc:p cmake:p jq:p 7zip:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 4a2908e7ac41a..d0dd6285cb63e 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -141,7 +141,7 @@ x--expand-yaml-anchors--remove:
             gcc:p
             cmake:p
             jq:p
-            7z:p
+            7zip:p
           # should cmake and jq just always be x86_64?
           #   toolchain:p
           #python:p

From 7d5f459f0f07b18cc02df2ad7b75f64d94efe0b7 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 15 Jan 2024 22:17:14 +0000
Subject: [PATCH 121/168] .

---
 src/ci/scripts/install-msys2.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 027a674ccc6a4..225f95625fe07 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -70,4 +70,6 @@ if isWindows; then
     # wtf why is this even here??
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"
+
+    echo "\nexport PATH=\"/c/hostedtoolcache/windows/Python/3.7.9/x64/:\$PATH\"\n" >> ~/.profile
 fi

From be435b5ebf6a4f1433f51ed9a5dc3f272e3877c4 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 15 Jan 2024 22:58:09 +0000
Subject: [PATCH 122/168] .

---
 src/ci/scripts/install-msys2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 225f95625fe07..fd1060eef0664 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -71,5 +71,5 @@ if isWindows; then
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"
 
-    echo "\nexport PATH=\"/c/hostedtoolcache/windows/Python/3.7.9/x64/:\$PATH\"\n" >> ~/.profile
+    echo "\nexport PATH=\"/c/hostedtoolcache/windows/Python/3.7.9/x64/:\$PATH\"\n" >> ~/.bashrc
 fi

From 82815ddbc87944ceca0ff8cf103fc7c204a26337 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 00:30:16 +0000
Subject: [PATCH 123/168] .

---
 src/ci/scripts/install-msys2.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index fd1060eef0664..b6e6e91034b30 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -72,4 +72,6 @@ if isWindows; then
     rm -r "/c/mingw32/"
 
     echo "\nexport PATH=\"/c/hostedtoolcache/windows/Python/3.7.9/x64/:\$PATH\"\n" >> ~/.bashrc
+    echo .bashrc
+    cat ~/.bashrc
 fi

From ea7aad9015222511c8554ba5e7418a8f2a6d2ecf Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 00:48:06 +0000
Subject: [PATCH 124/168] .

---
 src/ci/scripts/install-msys2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index b6e6e91034b30..8bca71037b3d3 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -71,7 +71,7 @@ if isWindows; then
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"
 
-    echo "\nexport PATH=\"/c/hostedtoolcache/windows/Python/3.7.9/x64/:\$PATH\"\n" >> ~/.bashrc
+    echo -e "\nexport PATH=\"/c/hostedtoolcache/windows/Python/3.7.9/x64/:\$PATH\"" >> ~/.bashrc
     echo .bashrc
     cat ~/.bashrc
 fi

From 2e4d471538f28c5854d538774c257064b158661d Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 01:56:02 +0000
Subject: [PATCH 125/168] .

---
 src/ci/scripts/install-mingw.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 18793c3363960..dddbb47531394 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -81,4 +81,5 @@ if isWindows; then
     # echo "\n"
     # echo "MAJAHA /etc/pacman.d/mirrorlist.mingw64"
     # cat /etc/pacman.d/mirrorlist.mingw64
+    echo "PATH: $PATH"
 fi

From 4fc0e0f394e1aea59ce03dedc0cd6ff93ad7df65 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 02:24:24 +0000
Subject: [PATCH 126/168] .

---
 src/ci/scripts/install-msys2.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 8bca71037b3d3..ff39bd395d733 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -71,7 +71,7 @@ if isWindows; then
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"
 
-    echo -e "\nexport PATH=\"/c/hostedtoolcache/windows/Python/3.7.9/x64/:\$PATH\"" >> ~/.bashrc
-    echo .bashrc
-    cat ~/.bashrc
+    echo -e "\nexport PATH=\"/c/hostedtoolcache/windows/Python/3.7.9/x64/:\$PATH\"" >> ~/.profile
+    echo .profile
+    cat ~/.profile
 fi

From 6f089be3d4244e18808e9425b40db81db85e0629 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 02:47:23 +0000
Subject: [PATCH 127/168] .

---
 src/ci/scripts/install-mingw.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index dddbb47531394..6a0c25ab8e13b 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -82,4 +82,8 @@ if isWindows; then
     # echo "MAJAHA /etc/pacman.d/mirrorlist.mingw64"
     # cat /etc/pacman.d/mirrorlist.mingw64
     echo "PATH: $PATH"
+    echo "### ENV"
+    env
+    echo "### FSTAB"
+    cat /etc/fstab
 fi

From c2c5e1565ad1b1071a3f63cd06586c3c3c2421bc Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 03:13:12 +0000
Subject: [PATCH 128/168] .

---
 .github/workflows/ci.yml        | 12 ++++++------
 src/ci/github-actions/ci.yml    |  7 +++----
 src/ci/scripts/install-mingw.sh |  5 -----
 src/ci/scripts/install-msys2.sh |  4 ----
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4448a2c853e42..5513483ffa561 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,9 +97,9 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: strict
+          path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p jq:p 7zip:p\n"
+          pacboy: "gcc:p cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -488,9 +488,9 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: strict
+          path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p jq:p 7zip:p\n"
+          pacboy: "gcc:p cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -625,9 +625,9 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: strict
+          path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p jq:p 7zip:p\n"
+          pacboy: "gcc:p cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index d0dd6285cb63e..ac7428ae80b18 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -130,8 +130,7 @@ x--expand-yaml-anchors--remove:
           release: true
           # Inherit the full path from the windows environment, with msys's */bin/
           # dirs placed in front. This lets us run Windows-native Python etc.
-          # path-type: inherit
-          path-type: strict
+          path-type: inherit
           install: >
             make
             git
@@ -140,9 +139,9 @@ x--expand-yaml-anchors--remove:
           pacboy: >
             gcc:p
             cmake:p
-            jq:p
-            7zip:p
           # should cmake and jq just always be x86_64?
+          # jq:p
+          # 7zip:p
           #   toolchain:p
           #python:p
           #   mingw-w64-x86_64-python
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 6a0c25ab8e13b..18793c3363960 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -81,9 +81,4 @@ if isWindows; then
     # echo "\n"
     # echo "MAJAHA /etc/pacman.d/mirrorlist.mingw64"
     # cat /etc/pacman.d/mirrorlist.mingw64
-    echo "PATH: $PATH"
-    echo "### ENV"
-    env
-    echo "### FSTAB"
-    cat /etc/fstab
 fi
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index ff39bd395d733..027a674ccc6a4 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -70,8 +70,4 @@ if isWindows; then
     # wtf why is this even here??
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"
-
-    echo -e "\nexport PATH=\"/c/hostedtoolcache/windows/Python/3.7.9/x64/:\$PATH\"" >> ~/.profile
-    echo .profile
-    cat ~/.profile
 fi

From 83fdeabb91e4fbc039977a6e6f08b9d7a9e0044e Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 18:13:09 +0000
Subject: [PATCH 129/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5513483ffa561..89faf3a4230ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p\n"
+          pacboy: "clang:p cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -490,7 +490,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p\n"
+          pacboy: "clang:p cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -627,7 +627,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "gcc:p cmake:p\n"
+          pacboy: "clang:p cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index ac7428ae80b18..e8e6303f4b4a2 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -137,7 +137,7 @@ x--expand-yaml-anchors--remove:
             dos2unix
             diffutils
           pacboy: >
-            gcc:p
+            clang:p
             cmake:p
           # should cmake and jq just always be x86_64?
           # jq:p

From a5f68f82cc4c9a26f653f394e5cf1a291c938a71 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 19:42:03 +0000
Subject: [PATCH 130/168] .

---
 src/ci/scripts/install-mingw.sh | 4 ++++
 src/ci/scripts/install-msys2.sh | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 18793c3363960..3cb22ea87b479 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -81,4 +81,8 @@ if isWindows; then
     # echo "\n"
     # echo "MAJAHA /etc/pacman.d/mirrorlist.mingw64"
     # cat /etc/pacman.d/mirrorlist.mingw64
+    echo WHICH GCC:
+    which gcc
+    echo WHICH clang:
+    which clang
 fi
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 027a674ccc6a4..ba010f3d078e7 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -67,6 +67,8 @@ if isWindows; then
     rm -r "/c/msys64/"
     # Delete Strawberry Perl, which contains a version of mingw
     rm -r "/c/Strawberry/"
+    # Delete native CMake
+    rm -r "/c/Program Files/CMake/"
     # wtf why is this even here??
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"

From 9a8b3b7fc82326f627e241f1f9f3bf6c6db46d97 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 21:29:26 +0000
Subject: [PATCH 131/168] .

---
 src/ci/scripts/install-mingw.sh | 2 ++
 src/ci/scripts/install-msys2.sh | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 3cb22ea87b479..fc54d47f0bd92 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -85,4 +85,6 @@ if isWindows; then
     which gcc
     echo WHICH clang:
     which clang
+    echo "#### LS OF /mingw$bits/bin/: ####"
+    ls /mingw$bits/bin/
 fi
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index ba010f3d078e7..95a0155309de3 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -53,12 +53,6 @@ if isWindows; then
     echo "#### LS OF C DRIVE: ####"
     ls /c/
 
-    echo "#### LS OF /c/msys64/: ####"
-    ls /c/msys64/
-
-    echo "#### LS OF /c/mingw64/bin/: ####"
-    ls /c/mingw64/bin/
-
     # Delete these pre-installed tools because we are using the MSYS2 setup action versions
     # instead, so we can't accidentally use them.
     # Delete Windows-Git

From 2e603495e85d9fd672cbf5d8024ae57f772ca412 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 22:49:05 +0000
Subject: [PATCH 132/168] .

---
 .github/workflows/ci.yml     | 4 ++++
 src/ci/github-actions/ci.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 89faf3a4230ca..38763f9305871 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,12 +56,14 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
               SCRIPT: make ci-mingw
               NO_DOWNLOAD_CI_LLVM: 1
+              CC: clang
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
               SCRIPT: make ci-mingw
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
+              CC: clang
             os: windows-2019-8core-32gb
           - name: dist-i686-mingw
             env:
@@ -69,6 +71,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               SCRIPT: python x.py dist bootstrap --include-default-paths
               DIST_REQUIRE_ALL_TOOLS: 1
+              CC: clang
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
             env:
@@ -76,6 +79,7 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
               DIST_REQUIRE_ALL_TOOLS: 1
+              CC: clang
             os: windows-2019-8core-32gb
           - name: x86_64-gnu
             os: ubuntu-20.04-4core-16gb
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index e8e6303f4b4a2..78599f0f375c8 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -375,6 +375,7 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               #CUSTOM_MINGW: 1
+              CC: clang
             <<: *job-windows-8c
 
           - name: x86_64-mingw
@@ -387,6 +388,7 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               #CUSTOM_MINGW: 1
+              CC: clang
             <<: *job-windows-8c
           
           - name: dist-i686-mingw
@@ -401,6 +403,7 @@ jobs:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               #CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
+              CC: clang
             <<: *job-windows-8c
 
           - name: dist-x86_64-mingw
@@ -415,6 +418,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               #CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
+              CC: clang
             <<: *job-windows-8c
 
           - name: x86_64-gnu

From 89f0c068d77dd666db83a525ad8c9b93e1849654 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 16 Jan 2024 23:19:42 +0000
Subject: [PATCH 133/168] .

---
 .github/workflows/ci.yml     | 4 ++++
 src/ci/github-actions/ci.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 38763f9305871..c1d617df7dc7b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,6 +57,7 @@ jobs:
               SCRIPT: make ci-mingw
               NO_DOWNLOAD_CI_LLVM: 1
               CC: clang
+              CXX: clang++
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
@@ -64,6 +65,7 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
               CC: clang
+              CXX: clang++
             os: windows-2019-8core-32gb
           - name: dist-i686-mingw
             env:
@@ -72,6 +74,7 @@ jobs:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               DIST_REQUIRE_ALL_TOOLS: 1
               CC: clang
+              CXX: clang++
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
             env:
@@ -80,6 +83,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               DIST_REQUIRE_ALL_TOOLS: 1
               CC: clang
+              CXX: clang++
             os: windows-2019-8core-32gb
           - name: x86_64-gnu
             os: ubuntu-20.04-4core-16gb
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 78599f0f375c8..864d5ca256ff2 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -376,6 +376,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               #CUSTOM_MINGW: 1
               CC: clang
+              CXX: clang++
             <<: *job-windows-8c
 
           - name: x86_64-mingw
@@ -389,6 +390,7 @@ jobs:
               NO_DOWNLOAD_CI_LLVM: 1
               #CUSTOM_MINGW: 1
               CC: clang
+              CXX: clang++
             <<: *job-windows-8c
           
           - name: dist-i686-mingw
@@ -404,6 +406,7 @@ jobs:
               #CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
               CC: clang
+              CXX: clang++
             <<: *job-windows-8c
 
           - name: dist-x86_64-mingw
@@ -419,6 +422,7 @@ jobs:
               #CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
               CC: clang
+              CXX: clang++
             <<: *job-windows-8c
 
           - name: x86_64-gnu

From 267b45a284edc0f5112591a41fcc6daacae772a4 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 17 Jan 2024 19:14:00 +0000
Subject: [PATCH 134/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1d617df7dc7b..c0e8974d58a08 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,7 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
+          msystem: "${{ contains(matrix.name, 'i686') && 'clang32' || 'clang64' }}"
           update: false
           release: true
           path-type: inherit
@@ -493,7 +493,7 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
+          msystem: "${{ contains(matrix.name, 'i686') && 'clang32' || 'clang64' }}"
           update: false
           release: true
           path-type: inherit
@@ -630,7 +630,7 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
+          msystem: "${{ contains(matrix.name, 'i686') && 'clang32' || 'clang64' }}"
           update: false
           release: true
           path-type: inherit
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 864d5ca256ff2..daa14abea177a 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -122,7 +122,7 @@ x--expand-yaml-anchors--remove:
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
         with:
           # i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64.
-          msystem: ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}
+          msystem: ${{ contains(matrix.name, 'i686') && 'clang32' || 'clang64' }}
           # don't try to download package updates from the network
           update: false
           # don't try to use the msys that comes built-in to the github runner,

From 3f8df376b4d1139b3dd90b95bb1c69fad25b06ad Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 17 Jan 2024 19:27:27 +0000
Subject: [PATCH 135/168] .

---
 src/ci/scripts/install-mingw.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index fc54d47f0bd92..f6be34f60c48a 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -82,9 +82,11 @@ if isWindows; then
     # echo "MAJAHA /etc/pacman.d/mirrorlist.mingw64"
     # cat /etc/pacman.d/mirrorlist.mingw64
     echo WHICH GCC:
-    which gcc
+    which gcc || true
     echo WHICH clang:
-    which clang
+    which clang || true
     echo "#### LS OF /mingw$bits/bin/: ####"
     ls /mingw$bits/bin/
+    echo "#### LS OF /clang$bits/bin/: ####"
+    ls /clang$bits/bin/
 fi

From d81a8888d6cfb92720ce46665f82dcd6248c5d12 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 18 Jan 2024 00:12:28 +0000
Subject: [PATCH 136/168] .

---
 src/ci/github-actions/ci.yml    | 31 ++++---------------
 src/ci/scripts/install-clang.sh | 22 ++++++--------
 src/ci/scripts/install-mingw.sh | 54 ++++++++-------------------------
 src/ci/scripts/install-msys2.sh | 34 ++-------------------
 src/ci/shared.sh                | 10 ++++++
 5 files changed, 41 insertions(+), 110 deletions(-)

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index daa14abea177a..409091274e244 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -122,13 +122,13 @@ x--expand-yaml-anchors--remove:
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
         with:
           # i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64.
-          msystem: ${{ contains(matrix.name, 'i686') && 'clang32' || 'clang64' }}
+          msystem: ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}
           # don't try to download package updates from the network
           update: false
           # don't try to use the msys that comes built-in to the github runner,
           # so we can control what is installed (i.e. not python)
           release: true
-          # Inherit the full path from the windows environment, with msys's */bin/
+          # Inherit the full path from the Windows environment, with MSYS2's */bin/
           # dirs placed in front. This lets us run Windows-native Python etc.
           path-type: inherit
           install: >
@@ -137,20 +137,7 @@ x--expand-yaml-anchors--remove:
             dos2unix
             diffutils
           pacboy: >
-            clang:p
             cmake:p
-          # should cmake and jq just always be x86_64?
-          # jq:p
-          # 7zip:p
-          #   toolchain:p
-          #python:p
-          #   mingw-w64-x86_64-python
-          #   mingw-w64-x86_64-jq
-          #   mingw-w64-x86_64-7zip
-          #   mingw-w64-x86_64-toolchain
-          #   mingw-w64-i686-toolchain
-          #   mingw-w64-x86_64-cmake
-          # mingw-w64-x86_64-sccache
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh
@@ -374,7 +361,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              #CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 1
               CC: clang
               CXX: clang++
             <<: *job-windows-8c
@@ -388,9 +375,7 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              #CUSTOM_MINGW: 1
-              CC: clang
-              CXX: clang++
+              CUSTOM_MINGW: 1
             <<: *job-windows-8c
           
           - name: dist-i686-mingw
@@ -403,10 +388,8 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               SCRIPT: python x.py dist bootstrap --include-default-paths
-              #CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
-              CC: clang
-              CXX: clang++
             <<: *job-windows-8c
 
           - name: dist-x86_64-mingw
@@ -419,10 +402,8 @@ jobs:
               # We are intentionally allowing an old toolchain on this builder (and that's
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
-              #CUSTOM_MINGW: 1
+              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
-              CC: clang
-              CXX: clang++
             <<: *job-windows-8c
 
           - name: x86_64-gnu
diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh
index 404cece6fac67..caa34ec8f3455 100755
--- a/src/ci/scripts/install-clang.sh
+++ b/src/ci/scripts/install-clang.sh
@@ -37,11 +37,7 @@ if isMacOS; then
     # Configure `AR` specifically so rustbuild doesn't try to infer it as
     # `clang-ar` by accident.
     ciCommandSetEnv AR "ar"
-elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
-    # This seems to contradict what's going on in install-mingw.sh.
-    # if CUSTOM_MINGW ins't set, that script installs mingw, but this script
-    # ensure's it isn't used! (to compile llvm, anyway)
-
+elif isWindows && ! isMingwBuild; then
     # If we're compiling for MSVC then we, like most other distribution builders,
     # switch to clang as the compiler. This'll allow us eventually to enable LTO
     # amongst LLVM and rustc. Note that we only do this on MSVC as I don't think
@@ -52,13 +48,13 @@ elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
     # don't want to run the installer directly; extracting it is more reliable
     # in CI environments.
 
-    # mkdir -p citools/clang-rust
-    # cd citools
-    # retry curl -f "${MIRRORS_BASE}/LLVM-${LLVM_VERSION}-win64.exe" \
-    #     -o "LLVM-${LLVM_VERSION}-win64.exe"
-    # 7z x -oclang-rust/ "LLVM-${LLVM_VERSION}-win64.exe"
-    # ciCommandSetEnv RUST_CONFIGURE_ARGS \
-    #     "${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"
+    mkdir -p citools/clang-rust
+    cd citools
+    retry curl -f "${MIRRORS_BASE}/LLVM-${LLVM_VERSION}-win64.exe" \
+        -o "LLVM-${LLVM_VERSION}-win64.exe"
+    7z x -oclang-rust/ "LLVM-${LLVM_VERSION}-win64.exe"
+    ciCommandSetEnv RUST_CONFIGURE_ARGS \
+        "${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"
 
     # Disable downloading CI LLVM on this builder;
     # setting up clang-cl just above conflicts with the default if-unchanged option.
@@ -68,5 +64,5 @@ fi
 if isWindows; then
     # GitHub image 20210928.2 added LLVM, but it is broken (and we don't want
     # to use it anyways).
-    rm -rf /c/Program\ Files/LLVM # interesting, should do with Git etc?
+    rm -rf /c/Program\ Files/LLVM
 fi
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index f6be34f60c48a..9e6bc05755b4f 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -46,47 +46,19 @@ if isWindows; then
             ;;
     esac
 
-    if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
-        echo "1pacman -Qg mingw-w64-x86_64-toolchain:"
-        # pacman -Qg mingw-w64-x86_64-toolchain # this gets run even for msvc jobs,
-        # # checks if the package (group) is installed
-        # pacman -Syu --noconfirm
-        # pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
-        #     mingw-w64-$arch-gcc \
-        #     mingw-w64-$arch-python
-        # ^the python package is actually for python3 #suspect, is this python even used?
-        # #ciCommandAddPath "/mingw${bits}/bin"
-        # ^alternatively, could maybe run bash without --noprofile and --norc in ci.yml
-        # echo "CUSTOM MINGW PATH 0: /mingw${bits}/bin | $(cygpath -w "/mingw${bits}/bin")"
-        # echo "2pacman -Qg mingw-w64-x86_64-toolchain:"
-        # pacman -Qg mingw-w64-x86_64-toolchain
-    else
-        mingw_dir="mingw${bits}"
+    if isMingwBuild; then
+        if [[ "${CUSTOM_MINGW-0}" -eq 0 ]]; then
+            pacboy -S gcc:p
+            # Maybe even:
+            # pacboy -S clang:p
+            # It kinda works, for the opposite CI jobs that gcc works for.
+            # the windows part of install-clang.sh has something to say about this.
+        else
+            mingw_dir="mingw${bits}"
 
-        curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
-        # ^This doesn't seem to include python. Should install in msys2 step instead?
-        7z x -y mingw.7z > /dev/null
-        ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
-        #echo "CUSTM MINGW PATH 1: $(pwd)/${mingw_dir}/bin | $(cygpath -w $(pwd)/${mingw_dir}/bin)"
+            curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
+            7z x -y mingw.7z > /dev/null
+            ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
+        fi
     fi
-    # echo "MAJAHA 4: $(cygpath -w $(which git))"
-    # echo "MAJAHA 4: $(cygpath -w $(which python))"
-    # echo "MAJAHA 4: $(cygpath -w $(which gcc))"
-    echo "MAJAHA cmake: $(cygpath -w $(which cmake))"
-    # echo "LS: $(ls)"
-    # echo "GITHUB_PATH: $GITHUB_PATH"
-    # cat "$GITHUB_PATH"
-    # echo "MAJAHA /etc/pacman.conf"
-    # cat /etc/pacman.conf
-    # echo "\n"
-    # echo "MAJAHA /etc/pacman.d/mirrorlist.mingw64"
-    # cat /etc/pacman.d/mirrorlist.mingw64
-    echo WHICH GCC:
-    which gcc || true
-    echo WHICH clang:
-    which clang || true
-    echo "#### LS OF /mingw$bits/bin/: ####"
-    ls /mingw$bits/bin/
-    echo "#### LS OF /clang$bits/bin/: ####"
-    ls /clang$bits/bin/
 fi
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 95a0155309de3..18ca2ee522142 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -1,32 +1,12 @@
 #!/bin/bash
-# Download and install MSYS2, needed primarily for the test suite (run-make) but
-# also used by the MinGW toolchain for assembling things.
+# Clean up and prepare the MSYS2 installation. MSYS2 is needed primarily for
+# the test suite (run-make), but is also used by the MinGW toolchain for assembling things.
 
 set -euo pipefail
 IFS=$'\n\t'
 
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
-# should try to remove windows git from the path.
-# There are two different windows gits at C:\Program Files\Git\mingw64\bin\git.exe
-# and C:\Program Files\Git\bin\git.exe ?!
 if isWindows; then
-    echo "Path of / : $(cygpath -w /)"
-    echo "PATH: $PATH"
-    echo "##### /mingw64/bin"
-    ls /mingw64/bin
-    echo "##### /bin"
-    ls /bin
-    echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
-    echo "MSYSTEM: ${MSYSTEM-unset}"
-    echo "MAJAHA 1: $(cygpath -w $(which git))"
-    msys2Path="c:/msys64"
-    mkdir -p "${msys2Path}/home/${USERNAME}"
-    #ciCommandAddPath "${msys2Path}/usr/bin"
-    #^ This is what rotates the CI shell from Git bash to msys bash i think
-    echo "MAJAHA 2: $(cygpath -w $(which git))"
-    echo "GITHUB_PATH: $GITHUB_PATH"
-    cat "$GITHUB_PATH"
-
     # Detect the native Python version installed on the agent. On GitHub
     # Actions, the C:\hostedtoolcache\windows\Python directory contains a
     # subdirectory for each installed Python version.
@@ -42,16 +22,8 @@ if isWindows; then
     if ! [[ -f "${python_home}/python3.exe" ]]; then
         cp "${python_home}/python.exe" "${python_home}/python3.exe"
     fi
-    echo "MAJAHA 1: $(cygpath -w $(which python))"
     ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
     ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
-    echo "MAJAHA 2: $(cygpath -w $(which python))"
-    echo "LS: $(ls)"
-    echo "GITHUB_PATH: $GITHUB_PATH"
-    cat "$GITHUB_PATH"
-
-    echo "#### LS OF C DRIVE: ####"
-    ls /c/
 
     # Delete these pre-installed tools because we are using the MSYS2 setup action versions
     # instead, so we can't accidentally use them.
@@ -63,7 +35,7 @@ if isWindows; then
     rm -r "/c/Strawberry/"
     # Delete native CMake
     rm -r "/c/Program Files/CMake/"
-    # wtf why is this even here??
+    # Delete these other copies of mingw, I don't even know where they come from.
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"
 fi
diff --git a/src/ci/shared.sh b/src/ci/shared.sh
index 720394af249b2..aabe3bd3586f4 100644
--- a/src/ci/shared.sh
+++ b/src/ci/shared.sh
@@ -52,6 +52,16 @@ function isLinux {
     [[ "${OSTYPE}" = "linux-gnu" ]]
 }
 
+function isMingwBuild {
+    if isGitHubActions; then
+        [[ foooa == *a ]]
+        return
+    else
+        echo "isMingwBuild only works inside CI!"
+        exit 1
+    fi
+}
+
 function isCiBranch {
     if [[ $# -ne 1 ]]; then
         echo "usage: $0 <branch-name>"

From d7975ee07c89a8d8d55938f983afb4dd562eaa17 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 18 Jan 2024 01:03:00 +0000
Subject: [PATCH 137/168] .

---
 src/ci/github-actions/ci.yml    | 2 --
 src/ci/scripts/install-mingw.sh | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 409091274e244..1c5e7e34582c7 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -362,8 +362,6 @@ jobs:
               # incompatible with LLVM downloads today).
               NO_DOWNLOAD_CI_LLVM: 1
               CUSTOM_MINGW: 1
-              CC: clang
-              CXX: clang++
             <<: *job-windows-8c
 
           - name: x86_64-mingw
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 9e6bc05755b4f..3a7c7ccaa268c 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -48,9 +48,9 @@ if isWindows; then
 
     if isMingwBuild; then
         if [[ "${CUSTOM_MINGW-0}" -eq 0 ]]; then
-            pacboy -S gcc:p
+            pacboy -S --noconfirm gcc:p
             # Maybe even:
-            # pacboy -S clang:p
+            # pacboy -S --noconfirm clang:p
             # It kinda works, for the opposite CI jobs that gcc works for.
             # the windows part of install-clang.sh has something to say about this.
         else

From 81684187232445c1c14ebc5349004f2a8c93f16b Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 18 Jan 2024 01:38:07 +0000
Subject: [PATCH 138/168] .

---
 .github/workflows/ci.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c0e8974d58a08..4a064751d5732 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,34 +56,30 @@ jobs:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
               SCRIPT: make ci-mingw
               NO_DOWNLOAD_CI_LLVM: 1
-              CC: clang
-              CXX: clang++
+              CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
           - name: x86_64-mingw
             env:
               SCRIPT: make ci-mingw
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
-              CC: clang
-              CXX: clang++
+              CUSTOM_MINGW: 1
             os: windows-2019-8core-32gb
           - name: dist-i686-mingw
             env:
               RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
               SCRIPT: python x.py dist bootstrap --include-default-paths
+              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
-              CC: clang
-              CXX: clang++
             os: windows-2019-8core-32gb
           - name: dist-x86_64-mingw
             env:
               SCRIPT: python x.py dist bootstrap --include-default-paths
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
               NO_DOWNLOAD_CI_LLVM: 1
+              CUSTOM_MINGW: 1
               DIST_REQUIRE_ALL_TOOLS: 1
-              CC: clang
-              CXX: clang++
             os: windows-2019-8core-32gb
           - name: x86_64-gnu
             os: ubuntu-20.04-4core-16gb
@@ -102,12 +98,12 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, 'i686') && 'clang32' || 'clang64' }}"
+          msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "clang:p cmake:p\n"
+          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -493,12 +489,12 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, 'i686') && 'clang32' || 'clang64' }}"
+          msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "clang:p cmake:p\n"
+          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -630,12 +626,12 @@ jobs:
       - if: "contains(matrix.os, 'windows')"
         uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
         with:
-          msystem: "${{ contains(matrix.name, 'i686') && 'clang32' || 'clang64' }}"
+          msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "clang:p cmake:p\n"
+          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:

From 9e23f5bb359583a6ac0823a09cd903657db06281 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Thu, 18 Jan 2024 23:42:49 +0000
Subject: [PATCH 139/168] .

---
 msys problem.txt                              | 40 -------------------
 src/bootstrap/src/core/build_steps/llvm.rs    |  4 --
 src/bootstrap/src/utils/cc_detect.rs          |  4 --
 src/ci/run.sh                                 |  9 ++---
 src/ci/scripts/disable-git-crlf-conversion.sh |  9 -----
 src/ci/scripts/install-mingw.sh               | 10 +----
 src/ci/shared.sh                              |  2 +-
 7 files changed, 5 insertions(+), 73 deletions(-)
 delete mode 100644 msys problem.txt

diff --git a/msys problem.txt b/msys problem.txt
deleted file mode 100644
index 620fa3d16908b..0000000000000
--- a/msys problem.txt	
+++ /dev/null
@@ -1,40 +0,0 @@
-[src\core\config\config.rs:1155] PathBuf::from(git_root.trim()) = "/d/programming/repos/rust"
-thread 'main' panicked at src\core\config\config.rs:1155:80:
-called `Result::unwrap()` on an `Err` value: Os { code: 3, kind: NotFound, message: "The system cann
-ot find the path specified." }
-stack backtrace:
-   0: rust_begin_unwind
-             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d/library\std\src/panicking.rs:597:5
-   1: core::panicking::panic_fmt
-             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d/library\core\src/panicking.rs:72:14
-   2: core::result::unwrap_failed
-             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d/library\core\src/result.rs:1652:5
-   3: core::result::Result<T,E>::unwrap
-             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d\library\core\src/result.rs:1077:23
-   4: bootstrap::core::config::config::Config::parse_inner
-             at .\src\bootstrap\src\core\config\config.rs:1155:28
-   5: bootstrap::core::config::config::Config::parse
-             at .\src\bootstrap\src\core\config\config.rs:1111:9
-   6: bootstrap::main
-             at .\src\bootstrap\src/bin\main.rs:20:18
-   7: core::ops::function::FnOnce::call_once
-             at /rustc/b5c050febf10c9bcc0459d41fe2a1e190ad30b8d\library\core\src\ops/function.rs:250:5
-
-Things to try: use native python. use native git. Use git bash (which is also msys)?
-Is it because mingw on msys is essentially a cross-compiler, from msys to windows native? i.e. from a posix-y emulated environment to
-a windows native one. So the src/bootstrap binary expects windows-y paths, unlike the rest of the build
-environment which wants posix-y paths. Maybe we should be treating this more like a cross compile, and
-building bootstrap with the msys profile rather than the mingw profile (profiles of msys, that is).
-Or alternatively, we could teach bootstrap to understand the msys paths and convert them to windows
-paths, maybe with an environment variable or flag, as a hack. We could also tell people to just use
-git-for-windows instead, as a different hack.
-
-Like, what happens if you target i686 on an x86_64 host? Bootstrap gets built for x86_64, surely?
-
-Maybe the problem is that I set build.build triple to windows-gnu in config.toml?
-
-Trying delete msys git and "PATH=$PATH:/c/Program\ Files/Git/cmd/ python x.py build"... Seems to be working!
-
-Should try delete msys python and "^^^"
-
-CI is probably passing because git-for-windows is still on the PATH, even after the shell changes to msys one.
\ No newline at end of file
diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
index b50fbbcba5f96..4b2d3e9ab4b75 100644
--- a/src/bootstrap/src/core/build_steps/llvm.rs
+++ b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -662,12 +662,9 @@ fn configure_cmake(
         Some(ref cl) => (cl.into(), cl.into()),
         None => (builder.cc(target), builder.cxx(target).unwrap()),
     };
-    dbg!(&builder.config.llvm_clang_cl);
-    dbg!(&cc);
 
     // Handle msvc + ninja + ccache specially (this is what the bots use)
     if target.is_msvc() && builder.ninja() && builder.config.ccache.is_some() {
-        println!("Path A");
         let mut wrap_cc = env::current_exe().expect("failed to get cwd");
         wrap_cc.set_file_name("sccache-plus-cl.exe");
 
@@ -705,7 +702,6 @@ fn configure_cmake(
             cfg.env("SCCACHE_EXTRA_ARGS", "-m32");
         }
     } else {
-        println!("Path B");
         // If ccache is configured we inform the build a little differently how
         // to invoke ccache while also invoking our compilers.
         if use_compiler_launcher {
diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
index 11207847badfb..fb5b9d8c88f7d 100644
--- a/src/bootstrap/src/utils/cc_detect.rs
+++ b/src/bootstrap/src/utils/cc_detect.rs
@@ -111,14 +111,10 @@ pub fn find_target(build: &Build, target: TargetSelection) {
         .and_then(|c| c.cc.clone())
         .or_else(|| default_compiler(&mut cfg, Language::C, target, build))
     {
-        println!("MAJAHA FIND_TARGET 1");
         cfg.compiler(cc);
-    } else {
-        println!("MAJAHA FIND_TARGET 2");
     }
 
     let compiler = cfg.get_compiler();
-    dbg!(compiler.path());
     let ar = if let ar @ Some(..) = config.and_then(|c| c.ar.clone()) {
         ar
     } else {
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 3eb6fd0c34267..8895e5d4e3e80 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -76,12 +76,9 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set dist.compression-profile=balance
 # the LLVM build, as not to run out of memory.
 # This is an attempt to fix the spurious build error tracked by
 # https://github.com/rust-lang/rust/issues/108227.
-# if isWindows && [[ ${CUSTOM_MINGW-0} -eq 1 ]]; then
-# should do just on mingw, not "custom mingw". same problem of using "custom mingw"
-# to mean "mingw" as in that other script.
-#https://github.com/rust-lang-ci/rust/commit/b524c6277fd8f6826a97e5b83d397e03ae9c949f
-RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=1"
-# fi
+if isMingwBuild; then # probably won't work out of CI?
+    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=1"
+fi
 
 # Only produce xz tarballs on CI. gz tarballs will be generated by the release
 # process by recompressing the existing xz ones. This decreases the storage
diff --git a/src/ci/scripts/disable-git-crlf-conversion.sh b/src/ci/scripts/disable-git-crlf-conversion.sh
index 5ee702160509a..6de080a9fde00 100755
--- a/src/ci/scripts/disable-git-crlf-conversion.sh
+++ b/src/ci/scripts/disable-git-crlf-conversion.sh
@@ -10,13 +10,4 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-# echo MAJAHA
-# which which
-# which cygpath
-# cygpath -w /
-# echo MAJAHA2
-# ls /
-# mkdir /home/runneradmin
-# ls /home/
-
 git config --replace-all --global core.autocrlf false
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 3a7c7ccaa268c..a76f62762a1d2 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -13,14 +13,6 @@ MINGW_ARCHIVE_32="i686-12.2.0-release-posix-dwarf-rt_v10-rev0.7z"
 MINGW_ARCHIVE_64="x86_64-12.2.0-release-posix-seh-rt_v10-rev0.7z"
 
 if isWindows; then
-    # echo "Path of / : $(cygpath -w /)"
-    # echo "PATH: $PATH"
-    # echo "MAJAHA PWD: $(pwd) | $(cygpath -w $(pwd))"
-    # echo "MSYSTEM: ${MSYSTEM-unset}"
-    # echo "MAJAHA 3: $(cygpath -w $(which git))"
-    # echo "MAJAHA 3: $(cygpath -w $(which python))"
-    # echo "GITHUB_PATH: $GITHUB_PATH"
-    # cat "$GITHUB_PATH"
     case "${CI_JOB_NAME}" in
         *i686*)
             bits=32
@@ -33,7 +25,7 @@ if isWindows; then
             mingw_archive="${MINGW_ARCHIVE_64}"
             ;;
         *aarch64*)
-            # aarch64 is a cross-compiled target. Use the x86_64 #NOTE check msystem variable CI
+            # aarch64 is a cross-compiled target. Use the x86_64
             # mingw, since that's the host architecture.
             bits=64
             arch=x86_64
diff --git a/src/ci/shared.sh b/src/ci/shared.sh
index aabe3bd3586f4..21e621c1e1566 100644
--- a/src/ci/shared.sh
+++ b/src/ci/shared.sh
@@ -54,7 +54,7 @@ function isLinux {
 
 function isMingwBuild {
     if isGitHubActions; then
-        [[ foooa == *a ]]
+        [[ "${CI_JOB_NAME}" == *mingw ]]
         return
     else
         echo "isMingwBuild only works inside CI!"

From 600f148ee86c9fa7b381fa89e6b8abd3175d4d77 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 19 Jan 2024 05:09:44 +0000
Subject: [PATCH 140/168] .

---
 .github/workflows/ci.yml        | 3 ---
 src/ci/github-actions/ci.yml    | 4 ++--
 src/ci/scripts/install-msys2.sh | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a064751d5732..a3b92df93e715 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -494,7 +493,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -631,7 +629,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 1c5e7e34582c7..0e3d144602b87 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -136,8 +136,8 @@ x--expand-yaml-anchors--remove:
             git
             dos2unix
             diffutils
-          pacboy: >
-            cmake:p
+          # pacboy: >
+          #   cmake:p
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 18ca2ee522142..2d52ee6ffc59d 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -34,7 +34,7 @@ if isWindows; then
     # Delete Strawberry Perl, which contains a version of mingw
     rm -r "/c/Strawberry/"
     # Delete native CMake
-    rm -r "/c/Program Files/CMake/"
+    # rm -r "/c/Program Files/CMake/"
     # Delete these other copies of mingw, I don't even know where they come from.
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"

From c6d26cd3303f914c89e799d0a922f57f9d45722f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 19 Jan 2024 21:45:29 +0000
Subject: [PATCH 141/168] .

---
 src/ci/github-actions/ci.yml                  |  2 +-
 src/ci/scripts/install-mingw.sh               | 24 +++++++++----------
 .../rlib-format-packed-bundled-libs/Makefile  |  3 ++-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 0e3d144602b87..dc06d10e5c13c 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -132,10 +132,10 @@ x--expand-yaml-anchors--remove:
           # dirs placed in front. This lets us run Windows-native Python etc.
           path-type: inherit
           install: >
-            make
             git
             dos2unix
             diffutils
+          # make
           # pacboy: >
           #   cmake:p
       
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index a76f62762a1d2..2d207b2cd3706 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -38,19 +38,17 @@ if isWindows; then
             ;;
     esac
 
-    if isMingwBuild; then
-        if [[ "${CUSTOM_MINGW-0}" -eq 0 ]]; then
-            pacboy -S --noconfirm gcc:p
-            # Maybe even:
-            # pacboy -S --noconfirm clang:p
-            # It kinda works, for the opposite CI jobs that gcc works for.
-            # the windows part of install-clang.sh has something to say about this.
-        else
-            mingw_dir="mingw${bits}"
+    if [[ "${CUSTOM_MINGW-0}" -eq 0 ]]; then
+        pacboy -S --noconfirm toolchain:p
+        # Maybe even:
+        # pacboy -S --noconfirm clang:p ...
+        # It kinda works, for the opposite CI jobs that gcc works for.
+        # the windows part of install-clang.sh has something to say about this.
+    else
+        mingw_dir="mingw${bits}"
 
-            curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
-            7z x -y mingw.7z > /dev/null
-            ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
-        fi
+        curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
+        7z x -y mingw.7z > /dev/null
+        ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
     fi
 fi
diff --git a/tests/run-make/rlib-format-packed-bundled-libs/Makefile b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
index f454da67893d0..5d32d09977906 100644
--- a/tests/run-make/rlib-format-packed-bundled-libs/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
@@ -13,7 +13,8 @@ else
 NM = nm
 endif
 
-all: $(call NATIVE_STATICLIB,native_dep_1) $(call NATIVE_STATICLIB,native_dep_2) $(call NATIVE_STATICLIB,native_dep_3)
+all: echo MAJAHA IS_WINDOWS: $(IS_WINDOWS) IS_MSVC: $(IS_MSVC)
+	$(call NATIVE_STATICLIB,native_dep_1) $(call NATIVE_STATICLIB,native_dep_2) $(call NATIVE_STATICLIB,native_dep_3)
 	$(RUSTC) rust_dep_up.rs --crate-type=rlib -Zpacked_bundled_libs
 	$(NM) $(TMPDIR)/librust_dep_up.rlib | $(CGREP) -e "U.*native_f2"
 	$(NM) $(TMPDIR)/librust_dep_up.rlib | $(CGREP) -e "U.*native_f3"

From 7ca59285a656bc030450adde64e14b0963651586 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 19 Jan 2024 22:36:06 +0000
Subject: [PATCH 142/168] .

---
 src/ci/scripts/install-mingw.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 2d207b2cd3706..3143fb075547c 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -39,6 +39,7 @@ if isWindows; then
     esac
 
     if [[ "${CUSTOM_MINGW-0}" -eq 0 ]]; then
+        pacman -S --noconfirm pactoys
         pacboy -S --noconfirm toolchain:p
         # Maybe even:
         # pacboy -S --noconfirm clang:p ...

From 16245b03450cb868c8bce04a0c2bc9f17fa3022f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 19 Jan 2024 23:20:17 +0000
Subject: [PATCH 143/168] .

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3b92df93e715..1313c3b20da14 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "git dos2unix diffutils\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "git dos2unix diffutils\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -628,7 +628,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "git dos2unix diffutils\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:

From dbc0b946e4eb9a5f24145a21998a6ce72a765fc6 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 19 Jan 2024 23:39:26 +0000
Subject: [PATCH 144/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1313c3b20da14..a3b92df93e715 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "git dos2unix diffutils\n"
+          install: "make git dos2unix diffutils\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "git dos2unix diffutils\n"
+          install: "make git dos2unix diffutils\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -628,7 +628,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "git dos2unix diffutils\n"
+          install: "make git dos2unix diffutils\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index dc06d10e5c13c..0e3d144602b87 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -132,10 +132,10 @@ x--expand-yaml-anchors--remove:
           # dirs placed in front. This lets us run Windows-native Python etc.
           path-type: inherit
           install: >
+            make
             git
             dos2unix
             diffutils
-          # make
           # pacboy: >
           #   cmake:p
       

From 71342db5fb58c5109402d1ca6546eaf9ee59c1fd Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 20 Jan 2024 01:20:24 +0000
Subject: [PATCH 145/168] .

---
 tests/run-make/rlib-format-packed-bundled-libs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-make/rlib-format-packed-bundled-libs/Makefile b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
index 5d32d09977906..7bd55f283535b 100644
--- a/tests/run-make/rlib-format-packed-bundled-libs/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
@@ -13,7 +13,7 @@ else
 NM = nm
 endif
 
-all: echo MAJAHA IS_WINDOWS: $(IS_WINDOWS) IS_MSVC: $(IS_MSVC)
+all: echo MAJAHA IS_WINDOWS $(IS_WINDOWS) IS_MSVC $(IS_MSVC)
 	$(call NATIVE_STATICLIB,native_dep_1) $(call NATIVE_STATICLIB,native_dep_2) $(call NATIVE_STATICLIB,native_dep_3)
 	$(RUSTC) rust_dep_up.rs --crate-type=rlib -Zpacked_bundled_libs
 	$(NM) $(TMPDIR)/librust_dep_up.rlib | $(CGREP) -e "U.*native_f2"

From f579a65bf6111e309379911d270def7c846505c4 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sat, 20 Jan 2024 03:10:21 +0000
Subject: [PATCH 146/168] .

---
 tests/run-make/rlib-format-packed-bundled-libs/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/run-make/rlib-format-packed-bundled-libs/Makefile b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
index 7bd55f283535b..7455c8b67fcb1 100644
--- a/tests/run-make/rlib-format-packed-bundled-libs/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
@@ -13,8 +13,8 @@ else
 NM = nm
 endif
 
-all: echo MAJAHA IS_WINDOWS $(IS_WINDOWS) IS_MSVC $(IS_MSVC)
-	$(call NATIVE_STATICLIB,native_dep_1) $(call NATIVE_STATICLIB,native_dep_2) $(call NATIVE_STATICLIB,native_dep_3)
+all: $(call NATIVE_STATICLIB,native_dep_1) $(call NATIVE_STATICLIB,native_dep_2) $(call NATIVE_STATICLIB,native_dep_3)
+	echo MAJAHA IS_WINDOWS $(IS_WINDOWS) IS_MSVC $(IS_MSVC)
 	$(RUSTC) rust_dep_up.rs --crate-type=rlib -Zpacked_bundled_libs
 	$(NM) $(TMPDIR)/librust_dep_up.rlib | $(CGREP) -e "U.*native_f2"
 	$(NM) $(TMPDIR)/librust_dep_up.rlib | $(CGREP) -e "U.*native_f3"

From 9dca7033f7bce0b110822d158f2829b0f00b44d3 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 21 Jan 2024 03:25:23 +0000
Subject: [PATCH 147/168] .

---
 src/bootstrap/mk/Makefile.in                           |  2 +-
 src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile        |  2 +-
 src/ci/run.sh                                          |  2 +-
 src/ci/scripts/install-clang.sh                        |  2 +-
 src/ci/shared.sh                                       | 10 ++--------
 .../run-make/rlib-format-packed-bundled-libs/Makefile  |  1 -
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 2d9416a823ee3..0b67079917c7f 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -77,7 +77,7 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:
-	$(Q)$(CFG_SRC_DIR)/x test --stage 2 --skip tidy
+	$(Q)$(CFG_SRC_DIR)/x test --stage 2 tidy
 ci-mingw-bootstrap:
 	$(Q)$(BOOTSTRAP) test --stage 2 --skip tidy
 ci-mingw: ci-mingw-x ci-mingw-bootstrap
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
index 3f1637f523965..9025e9bb0a3af 100644
--- a/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
@@ -27,4 +27,4 @@ ENV RUST_CONFIGURE_ARGS \
  --enable-sanitizers \
  --enable-profiler \
  --enable-compiler-docs
-ENV SCRIPT python3 ../x.py --stage 2 test --skip tidy
+ENV SCRIPT python3 ../x.py --stage 2 test
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 8895e5d4e3e80..459253308cef9 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -76,7 +76,7 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set dist.compression-profile=balance
 # the LLVM build, as not to run out of memory.
 # This is an attempt to fix the spurious build error tracked by
 # https://github.com/rust-lang/rust/issues/108227.
-if isMingwBuild; then # probably won't work out of CI?
+if isKnownToBeMingwBuild; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=1"
 fi
 
diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh
index caa34ec8f3455..aa7ff813f5161 100755
--- a/src/ci/scripts/install-clang.sh
+++ b/src/ci/scripts/install-clang.sh
@@ -37,7 +37,7 @@ if isMacOS; then
     # Configure `AR` specifically so rustbuild doesn't try to infer it as
     # `clang-ar` by accident.
     ciCommandSetEnv AR "ar"
-elif isWindows && ! isMingwBuild; then
+elif isWindows && ! isKnownToBeMingwBuild; then
     # If we're compiling for MSVC then we, like most other distribution builders,
     # switch to clang as the compiler. This'll allow us eventually to enable LTO
     # amongst LLVM and rustc. Note that we only do this on MSVC as I don't think
diff --git a/src/ci/shared.sh b/src/ci/shared.sh
index 21e621c1e1566..2b0a10e4d08d9 100644
--- a/src/ci/shared.sh
+++ b/src/ci/shared.sh
@@ -52,14 +52,8 @@ function isLinux {
     [[ "${OSTYPE}" = "linux-gnu" ]]
 }
 
-function isMingwBuild {
-    if isGitHubActions; then
-        [[ "${CI_JOB_NAME}" == *mingw ]]
-        return
-    else
-        echo "isMingwBuild only works inside CI!"
-        exit 1
-    fi
+function isKnownToBeMingwBuild {
+    isGitHubActions && [[ "${CI_JOB_NAME}" == *mingw ]]
 }
 
 function isCiBranch {
diff --git a/tests/run-make/rlib-format-packed-bundled-libs/Makefile b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
index 7455c8b67fcb1..f454da67893d0 100644
--- a/tests/run-make/rlib-format-packed-bundled-libs/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
@@ -14,7 +14,6 @@ NM = nm
 endif
 
 all: $(call NATIVE_STATICLIB,native_dep_1) $(call NATIVE_STATICLIB,native_dep_2) $(call NATIVE_STATICLIB,native_dep_3)
-	echo MAJAHA IS_WINDOWS $(IS_WINDOWS) IS_MSVC $(IS_MSVC)
 	$(RUSTC) rust_dep_up.rs --crate-type=rlib -Zpacked_bundled_libs
 	$(NM) $(TMPDIR)/librust_dep_up.rlib | $(CGREP) -e "U.*native_f2"
 	$(NM) $(TMPDIR)/librust_dep_up.rlib | $(CGREP) -e "U.*native_f3"

From a9f8db97085034c233c1e75749408dbb6e708766 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 22 Jan 2024 07:52:48 +0000
Subject: [PATCH 148/168] .

---
 .github/workflows/ci.yml        | 3 +++
 README.md                       | 8 ++++----
 src/ci/github-actions/ci.yml    | 4 ++--
 src/ci/scripts/install-msys2.sh | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3b92df93e715..4a064751d5732 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,6 +103,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
+          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -493,6 +494,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
+          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -629,6 +631,7 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
+          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/README.md b/README.md
index 5d5beaf1b7a20..01c356553efb2 100644
--- a/README.md
+++ b/README.md
@@ -175,10 +175,10 @@ toolchain.
 
 1. Download the latest [MSYS2 installer][msys2] and go through the installer.
 
-2. Run `mingw32_shell.bat` or `mingw64_shell.bat` from the MSYS2 installation
-   directory (e.g. `C:\msys64`), depending on whether you want 32-bit or 64-bit
-   Rust. (As of the latest version of MSYS2 you have to run `msys2_shell.cmd
-   -mingw32` or `msys2_shell.cmd -mingw64` from the command line instead.)
+2. Start a MINGW64 or MINGW32 shell (depending on whether you want 32-bit
+   or 64-bit Rust) either from your start menu, or by running `mingw64.exe`
+   or `mingw32.exe` from your MSYS2 installation directory (e.g.
+   `C:\msys64`).
 
 3. From this terminal, install the required tools:
 
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 0e3d144602b87..1c5e7e34582c7 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -136,8 +136,8 @@ x--expand-yaml-anchors--remove:
             git
             dos2unix
             diffutils
-          # pacboy: >
-          #   cmake:p
+          pacboy: >
+            cmake:p
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 2d52ee6ffc59d..18ca2ee522142 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -34,7 +34,7 @@ if isWindows; then
     # Delete Strawberry Perl, which contains a version of mingw
     rm -r "/c/Strawberry/"
     # Delete native CMake
-    # rm -r "/c/Program Files/CMake/"
+    rm -r "/c/Program Files/CMake/"
     # Delete these other copies of mingw, I don't even know where they come from.
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"

From 273ab0c6090789e8ebb9f94bb70f6bc9b3151331 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 22 Jan 2024 09:49:05 +0000
Subject: [PATCH 149/168] .

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 01c356553efb2..5d5beaf1b7a20 100644
--- a/README.md
+++ b/README.md
@@ -175,10 +175,10 @@ toolchain.
 
 1. Download the latest [MSYS2 installer][msys2] and go through the installer.
 
-2. Start a MINGW64 or MINGW32 shell (depending on whether you want 32-bit
-   or 64-bit Rust) either from your start menu, or by running `mingw64.exe`
-   or `mingw32.exe` from your MSYS2 installation directory (e.g.
-   `C:\msys64`).
+2. Run `mingw32_shell.bat` or `mingw64_shell.bat` from the MSYS2 installation
+   directory (e.g. `C:\msys64`), depending on whether you want 32-bit or 64-bit
+   Rust. (As of the latest version of MSYS2 you have to run `msys2_shell.cmd
+   -mingw32` or `msys2_shell.cmd -mingw64` from the command line instead.)
 
 3. From this terminal, install the required tools:
 

From 6e5bc070e01a174c008c44c116f2f2ec8b7d9cd4 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 22 Jan 2024 20:45:54 +0000
Subject: [PATCH 150/168] .

---
 src/ci/github-actions/ci.yml    |  2 --
 src/ci/scripts/install-mingw.sh |  1 -
 src/ci/scripts/install-msys2.sh | 12 ++++++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 1c5e7e34582c7..95160b52ed708 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -136,8 +136,6 @@ x--expand-yaml-anchors--remove:
             git
             dos2unix
             diffutils
-          pacboy: >
-            cmake:p
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 3143fb075547c..2d207b2cd3706 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -39,7 +39,6 @@ if isWindows; then
     esac
 
     if [[ "${CUSTOM_MINGW-0}" -eq 0 ]]; then
-        pacman -S --noconfirm pactoys
         pacboy -S --noconfirm toolchain:p
         # Maybe even:
         # pacboy -S --noconfirm clang:p ...
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 18ca2ee522142..f0369f253bd1d 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -25,6 +25,9 @@ if isWindows; then
     ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
     ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
 
+    # Install pacboy for easily installing packages
+    pacman -S --noconfirm pactoys
+
     # Delete these pre-installed tools because we are using the MSYS2 setup action versions
     # instead, so we can't accidentally use them.
     # Delete Windows-Git
@@ -33,9 +36,14 @@ if isWindows; then
     rm -r "/c/msys64/"
     # Delete Strawberry Perl, which contains a version of mingw
     rm -r "/c/Strawberry/"
-    # Delete native CMake
-    rm -r "/c/Program Files/CMake/"
     # Delete these other copies of mingw, I don't even know where they come from.
     rm -r "/c/mingw64/"
     rm -r "/c/mingw32/"
+
+    if isKnownToBeMingwBuild; then
+        # Delete native CMake
+        rm -r "/c/Program Files/CMake/"
+        # Install mingw-w64-$arch-cmake
+        pacboy -S --noconfirm cmake:p
+    fi # Otherwise, the MSVC build needs native CMake, it fails with the mingw one.
 fi

From db9a3bb1312b423586bc08c2430029cc65b9a7d9 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 22 Jan 2024 23:22:11 +0000
Subject: [PATCH 151/168] .

---
 .github/workflows/ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a064751d5732..a3b92df93e715 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -494,7 +493,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -631,7 +629,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-          pacboy: "cmake:p\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:

From 584bfa7edd929335632ba032c5d5217c4adcfff2 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 23 Jan 2024 09:18:32 +0000
Subject: [PATCH 152/168] .

---
 src/ci/github-actions/ci.yml    | 1 +
 src/ci/scripts/install-msys2.sh | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 95160b52ed708..ddb8fa470a125 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -136,6 +136,7 @@ x--expand-yaml-anchors--remove:
             git
             dos2unix
             diffutils
+            python
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index f0369f253bd1d..d3ee91d4baa40 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -22,8 +22,9 @@ if isWindows; then
     if ! [[ -f "${python_home}/python3.exe" ]]; then
         cp "${python_home}/python.exe" "${python_home}/python3.exe"
     fi
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
+    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
+    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
+    rm -r /c/hostedtoolcache/windows/Python/
 
     # Install pacboy for easily installing packages
     pacman -S --noconfirm pactoys

From 2b983b9f41dc8d66420b0b67a83e4b2c473f66ee Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 23 Jan 2024 09:37:32 +0000
Subject: [PATCH 153/168] .

---
 .github/workflows/ci.yml        | 6 +++---
 src/ci/scripts/install-msys2.sh | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3b92df93e715..b4af24bff79c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "make git dos2unix diffutils python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "make git dos2unix diffutils python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -628,7 +628,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "make git dos2unix diffutils python\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index d3ee91d4baa40..822a5519c4e54 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -23,7 +23,8 @@ if isWindows; then
         cp "${python_home}/python.exe" "${python_home}/python3.exe"
     fi
     # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
+    # ciCommandAddPath "C:\\hostedtoolcache\\
+    #windows\\Python\\${native_python_version}\\x64\\Scripts"
     rm -r /c/hostedtoolcache/windows/Python/
 
     # Install pacboy for easily installing packages

From 61d3cf2454ca6696020f9054c7b6449bbc9f3f58 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 23 Jan 2024 10:04:30 +0000
Subject: [PATCH 154/168] .

---
 x | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x b/x
index 426b58d0d4ec7..78dba0a5c8f76 100755
--- a/x
+++ b/x
@@ -32,12 +32,14 @@ for SEARCH_PYTHON in py python3 python python2; do
         else
             extra_arg=""
         fi
+        echo MAJAHA1 $SEARCH_PYTHON $python
         exec "$python" $extra_arg "$xpy" "$@"
     fi
 done
 
 python=$(bash -c "compgen -c python" | grep '^python[2-3]\.[0-9]\+$' | head -n1)
 if ! [ "$python" = "" ]; then
+    echo MAJAHA2 $python
     exec "$python" "$xpy" "$@"
 fi
 

From 0ec36648a57fcc298c6a62002ea78531cd565545 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 23 Jan 2024 10:58:51 +0000
Subject: [PATCH 155/168] .

---
 src/ci/scripts/install-msys2.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 822a5519c4e54..6530391bf2e2c 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -26,6 +26,7 @@ if isWindows; then
     # ciCommandAddPath "C:\\hostedtoolcache\\
     #windows\\Python\\${native_python_version}\\x64\\Scripts"
     rm -r /c/hostedtoolcache/windows/Python/
+    rm /c/Windows/py.exe
 
     # Install pacboy for easily installing packages
     pacman -S --noconfirm pactoys

From a7d8d0b3f799c5d3d553aa353ed63bd69d5d4605 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 23 Jan 2024 12:06:05 +0000
Subject: [PATCH 156/168] .

---
 .github/workflows/ci.yml        | 6 +++---
 src/ci/github-actions/ci.yml    | 1 -
 src/ci/scripts/install-msys2.sh | 7 ++-----
 x                               | 2 --
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b4af24bff79c7..a3b92df93e715 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils python\n"
+          install: "make git dos2unix diffutils\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -492,7 +492,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils python\n"
+          install: "make git dos2unix diffutils\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -628,7 +628,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils python\n"
+          install: "make git dos2unix diffutils\n"
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index ddb8fa470a125..95160b52ed708 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -136,7 +136,6 @@ x--expand-yaml-anchors--remove:
             git
             dos2unix
             diffutils
-            python
       
       # - name: disable git crlf conversion
       #   run: src/ci/scripts/disable-git-crlf-conversion.sh
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 6530391bf2e2c..f0369f253bd1d 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -22,11 +22,8 @@ if isWindows; then
     if ! [[ -f "${python_home}/python3.exe" ]]; then
         cp "${python_home}/python.exe" "${python_home}/python3.exe"
     fi
-    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    # ciCommandAddPath "C:\\hostedtoolcache\\
-    #windows\\Python\\${native_python_version}\\x64\\Scripts"
-    rm -r /c/hostedtoolcache/windows/Python/
-    rm /c/Windows/py.exe
+    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
+    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
 
     # Install pacboy for easily installing packages
     pacman -S --noconfirm pactoys
diff --git a/x b/x
index 78dba0a5c8f76..426b58d0d4ec7 100755
--- a/x
+++ b/x
@@ -32,14 +32,12 @@ for SEARCH_PYTHON in py python3 python python2; do
         else
             extra_arg=""
         fi
-        echo MAJAHA1 $SEARCH_PYTHON $python
         exec "$python" $extra_arg "$xpy" "$@"
     fi
 done
 
 python=$(bash -c "compgen -c python" | grep '^python[2-3]\.[0-9]\+$' | head -n1)
 if ! [ "$python" = "" ]; then
-    echo MAJAHA2 $python
     exec "$python" "$xpy" "$@"
 fi
 

From 1e1f5f40329fdcebeac1719935075ecc3fe964f4 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 24 Jan 2024 09:00:07 +0000
Subject: [PATCH 157/168] .

---
 .github/workflows/ci.yml        | 6 +++---
 src/ci/github-actions/ci.yml    | 4 ++--
 src/ci/scripts/install-mingw.sh | 2 +-
 src/ci/scripts/install-msys2.sh | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3b92df93e715..ef1d767d676f6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,7 +96,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     steps:
       - if: "contains(matrix.os, 'windows')"
-        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
+        uses: msys2/setup-msys2@v2.22.0
         with:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
@@ -486,7 +486,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     steps:
       - if: "contains(matrix.os, 'windows')"
-        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
+        uses: msys2/setup-msys2@v2.22.0
         with:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
@@ -622,7 +622,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     steps:
       - if: "contains(matrix.os, 'windows')"
-        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b
+        uses: msys2/setup-msys2@v2.22.0
         with:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 95160b52ed708..16ddc82e1ed4a 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -119,11 +119,11 @@ x--expand-yaml-anchors--remove:
       <<: *shared-ci-variables
     steps:
       - if: contains(matrix.os, 'windows')
-        uses: msys2/setup-msys2@76b1bed68bac51ebe46cb431077217d4b98e2b7b #git SHA for v2.21.0
+        uses: msys2/setup-msys2@v2.22.0
         with:
           # i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64.
           msystem: ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}
-          # don't try to download package updates from the network
+          # don't try to download updates for already installed packages
           update: false
           # don't try to use the msys that comes built-in to the github runner,
           # so we can control what is installed (i.e. not python)
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 2d207b2cd3706..57c5a87c76d6a 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -43,7 +43,7 @@ if isWindows; then
         # Maybe even:
         # pacboy -S --noconfirm clang:p ...
         # It kinda works, for the opposite CI jobs that gcc works for.
-        # the windows part of install-clang.sh has something to say about this.
+        # The windows part of install-clang.sh has comments pertaining to this.
     else
         mingw_dir="mingw${bits}"
 
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index f0369f253bd1d..f668223e9700f 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -28,8 +28,8 @@ if isWindows; then
     # Install pacboy for easily installing packages
     pacman -S --noconfirm pactoys
 
-    # Delete these pre-installed tools because we are using the MSYS2 setup action versions
-    # instead, so we can't accidentally use them.
+    # Delete these pre-installed tools so we can't accidentally use them, because we are using the
+    # MSYS2 setup action versions instead.
     # Delete Windows-Git
     rm -r "/c/Program Files/Git/"
     # Delete pre-installed version of MSYS2

From 81693d969a235adede6d6ba8e4715a93e17f5649 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Wed, 7 Feb 2024 20:09:18 +0000
Subject: [PATCH 158/168] .

---
 src/ci/github-actions/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 16ddc82e1ed4a..bf35ffdcedf06 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -137,14 +137,14 @@ x--expand-yaml-anchors--remove:
             dos2unix
             diffutils
       
-      # - name: disable git crlf conversion
-      #   run: src/ci/scripts/disable-git-crlf-conversion.sh
+      - name: disable git crlf conversion
+        run: src/ci/scripts/disable-git-crlf-conversion.sh
 
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
-      
+
       # Rust Log Analyzer can't currently detect the PR number of a GitHub
       # Actions build on its own, so a hint in the log message is needed to
       # point it in the right direction.

From aa519a73b2bee58da56efa526d2c15383bc677cc Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 9 Feb 2024 02:17:00 +0000
Subject: [PATCH 159/168] TEMP STUFF

---
 .github/workflows/ci.yml | 6 ++++++
 INSTALL.md               | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 18e325a89aeda..c54c2cdafd763 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -105,6 +105,8 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
+      - name: disable git crlf conversion
+        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -508,6 +510,8 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
+      - name: disable git crlf conversion
+        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -645,6 +649,8 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
+      - name: disable git crlf conversion
+        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/INSTALL.md b/INSTALL.md
index b872d317e3627..1ca377bbdb6c5 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -145,10 +145,9 @@ toolchain.
 
 1. Download the latest [MSYS2 installer][msys2] and go through the installer.
 
-2. Run `mingw32_shell.bat` or `mingw64_shell.bat` from the MSYS2 installation
-   directory (e.g. `C:\msys64`), depending on whether you want 32-bit or 64-bit
-   Rust. (As of the latest version of MSYS2 you have to run `msys2_shell.cmd
-   -mingw32` or `msys2_shell.cmd -mingw64` from the command line instead.)
+2. Start a MINGW64 or MINGW32 shell (depending on whether you want 32-bit
+   or 64-bit Rust) either from your start menu, or by running `mingw64.exe`
+   or `mingw32.exe` from your MSYS2 installation directory (e.g. `C:\msys64`).
 
 3. From this terminal, install the required tools:
 

From 3d239cbaa476aa18eae9e55ffe00cdac528fba63 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Sun, 11 Feb 2024 22:04:19 +0000
Subject: [PATCH 160/168] .

---
 .github/workflows/ci.yml     | 6 ------
 src/ci/github-actions/ci.yml | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c54c2cdafd763..18e325a89aeda 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -105,8 +105,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-      - name: disable git crlf conversion
-        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -510,8 +508,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-      - name: disable git crlf conversion
-        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -649,8 +645,6 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
-      - name: disable git crlf conversion
-        run: src/ci/scripts/disable-git-crlf-conversion.sh
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 78a4de8a8cda6..39bbd85c0e17c 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -138,8 +138,8 @@ x--expand-yaml-anchors--remove:
             dos2unix
             diffutils
       
-      - name: disable git crlf conversion
-        run: src/ci/scripts/disable-git-crlf-conversion.sh
+      # - name: disable git crlf conversion
+      #   run: src/ci/scripts/disable-git-crlf-conversion.sh
 
       - name: checkout the source code
         uses: actions/checkout@v4

From 2801a43e26e20df17181c48278ccbbd50f8eb437 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Mon, 12 Feb 2024 03:04:31 +0000
Subject: [PATCH 161/168] .

---
 .github/workflows/ci.yml     | 6 ++++++
 src/ci/github-actions/ci.yml | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 18e325a89aeda..e4cd59bdf96c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -105,6 +105,8 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
+      - name: disable git crlf conversion
+        run: git config --global core.autocrlf false
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -508,6 +510,8 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
+      - name: disable git crlf conversion
+        run: git config --global core.autocrlf false
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
@@ -645,6 +649,8 @@ jobs:
           release: true
           path-type: inherit
           install: "make git dos2unix diffutils\n"
+      - name: disable git crlf conversion
+        run: git config --global core.autocrlf false
       - name: checkout the source code
         uses: actions/checkout@v4
         with:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 39bbd85c0e17c..4bd7ebfeaf145 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -137,9 +137,9 @@ x--expand-yaml-anchors--remove:
             git
             dos2unix
             diffutils
-      
-      # - name: disable git crlf conversion
-      #   run: src/ci/scripts/disable-git-crlf-conversion.sh
+
+      - name: disable git crlf conversion
+        run: git config --global core.autocrlf false
 
       - name: checkout the source code
         uses: actions/checkout@v4

From d1289306ed5600e479bd48a5fd0c94057837698f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 13 Feb 2024 07:26:21 +0000
Subject: [PATCH 162/168] .

---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e4cd59bdf96c5..bd5d48ce5146f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,7 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: inherit
+          path-type: strict
           install: "make git dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
@@ -508,7 +508,7 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: inherit
+          path-type: strict
           install: "make git dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
@@ -647,7 +647,7 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: inherit
+          path-type: strict
           install: "make git dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 4bd7ebfeaf145..092bc9f64e20a 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -131,7 +131,7 @@ x--expand-yaml-anchors--remove:
           release: true
           # Inherit the full path from the Windows environment, with MSYS2's */bin/
           # dirs placed in front. This lets us run Windows-native Python etc.
-          path-type: inherit
+          path-type: strict
           install: >
             make
             git

From 1686c35d1795131de563481b8cf7b1df5ce9204f Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 13 Feb 2024 07:32:16 +0000
Subject: [PATCH 163/168] Revert "."

This reverts commit d1289306ed5600e479bd48a5fd0c94057837698f.
---
 .github/workflows/ci.yml     | 6 +++---
 src/ci/github-actions/ci.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd5d48ce5146f..e4cd59bdf96c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,7 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: strict
+          path-type: inherit
           install: "make git dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
@@ -508,7 +508,7 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: strict
+          path-type: inherit
           install: "make git dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
@@ -647,7 +647,7 @@ jobs:
           msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
           update: false
           release: true
-          path-type: strict
+          path-type: inherit
           install: "make git dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 092bc9f64e20a..4bd7ebfeaf145 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -131,7 +131,7 @@ x--expand-yaml-anchors--remove:
           release: true
           # Inherit the full path from the Windows environment, with MSYS2's */bin/
           # dirs placed in front. This lets us run Windows-native Python etc.
-          path-type: strict
+          path-type: inherit
           install: >
             make
             git

From 52e9dc32b9fdb3ad56430ba0f8ebef418d7a7754 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 13 Feb 2024 07:33:43 +0000
Subject: [PATCH 164/168] .

---
 src/ci/scripts/install-msys2.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index f668223e9700f..3414b2d15c02a 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -12,18 +12,18 @@ if isWindows; then
     # subdirectory for each installed Python version.
     #
     # The -V flag of the sort command sorts the input by version number.
-    native_python_version="$(ls /c/hostedtoolcache/windows/Python | sort -Vr | head -n 1)"
+    # native_python_version="$(ls /c/hostedtoolcache/windows/Python | sort -Vr | head -n 1)"
 
-    # Make sure we use the native python interpreter instead of some msys equivalent
-    # one way or another. The msys interpreters seem to have weird path conversions
-    # baked in which break LLVM's build system one way or another, so let's use the
-    # native version which keeps everything as native as possible.
-    python_home="/c/hostedtoolcache/windows/Python/${native_python_version}/x64"
-    if ! [[ -f "${python_home}/python3.exe" ]]; then
-        cp "${python_home}/python.exe" "${python_home}/python3.exe"
-    fi
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
+    # # Make sure we use the native python interpreter instead of some msys equivalent
+    # # one way or another. The msys interpreters seem to have weird path conversions
+    # # baked in which break LLVM's build system one way or another, so let's use the
+    # # native version which keeps everything as native as possible.
+    # python_home="/c/hostedtoolcache/windows/Python/${native_python_version}/x64"
+    # if ! [[ -f "${python_home}/python3.exe" ]]; then
+    #     cp "${python_home}/python.exe" "${python_home}/python3.exe"
+    # fi
+    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
+    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
 
     # Install pacboy for easily installing packages
     pacman -S --noconfirm pactoys

From c8155ee14134e974ff7decea4371bf6ebc5db03d Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Tue, 13 Feb 2024 07:41:43 +0000
Subject: [PATCH 165/168] .

---
 src/ci/scripts/install-msys2.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 3414b2d15c02a..217a11bea0d2c 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -23,7 +23,8 @@ if isWindows; then
     #     cp "${python_home}/python.exe" "${python_home}/python3.exe"
     # fi
     # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
+    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}
+    # \\x64\\Scripts"
 
     # Install pacboy for easily installing packages
     pacman -S --noconfirm pactoys

From 11887c3bd7ba9b16974c87df9ebbf5e6947a3fc9 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 16 Feb 2024 05:08:36 +0000
Subject: [PATCH 166/168] Revert "."

This reverts commit c8155ee14134e974ff7decea4371bf6ebc5db03d.
---
 src/ci/scripts/install-msys2.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 217a11bea0d2c..3414b2d15c02a 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -23,8 +23,7 @@ if isWindows; then
     #     cp "${python_home}/python.exe" "${python_home}/python3.exe"
     # fi
     # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}
-    # \\x64\\Scripts"
+    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
 
     # Install pacboy for easily installing packages
     pacman -S --noconfirm pactoys

From b7531a9ed5b5d40ff01d89afd2585916dcd4553a Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 16 Feb 2024 05:13:33 +0000
Subject: [PATCH 167/168] Revert "."

This reverts commit 52e9dc32b9fdb3ad56430ba0f8ebef418d7a7754.
---
 src/ci/scripts/install-msys2.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index 3414b2d15c02a..f668223e9700f 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -12,18 +12,18 @@ if isWindows; then
     # subdirectory for each installed Python version.
     #
     # The -V flag of the sort command sorts the input by version number.
-    # native_python_version="$(ls /c/hostedtoolcache/windows/Python | sort -Vr | head -n 1)"
+    native_python_version="$(ls /c/hostedtoolcache/windows/Python | sort -Vr | head -n 1)"
 
-    # # Make sure we use the native python interpreter instead of some msys equivalent
-    # # one way or another. The msys interpreters seem to have weird path conversions
-    # # baked in which break LLVM's build system one way or another, so let's use the
-    # # native version which keeps everything as native as possible.
-    # python_home="/c/hostedtoolcache/windows/Python/${native_python_version}/x64"
-    # if ! [[ -f "${python_home}/python3.exe" ]]; then
-    #     cp "${python_home}/python.exe" "${python_home}/python3.exe"
-    # fi
-    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
-    # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
+    # Make sure we use the native python interpreter instead of some msys equivalent
+    # one way or another. The msys interpreters seem to have weird path conversions
+    # baked in which break LLVM's build system one way or another, so let's use the
+    # native version which keeps everything as native as possible.
+    python_home="/c/hostedtoolcache/windows/Python/${native_python_version}/x64"
+    if ! [[ -f "${python_home}/python3.exe" ]]; then
+        cp "${python_home}/python.exe" "${python_home}/python3.exe"
+    fi
+    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
+    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
 
     # Install pacboy for easily installing packages
     pacman -S --noconfirm pactoys

From b59241864c155e1f61bd1b16d17578c29970ad66 Mon Sep 17 00:00:00 2001
From: Matt Harding <majaharding@gmail.com>
Date: Fri, 16 Feb 2024 05:47:44 +0000
Subject: [PATCH 168/168] Use windows git for MSVC

---
 .github/workflows/ci.yml        |  6 +++---
 src/ci/github-actions/ci.yml    |  1 -
 src/ci/scripts/install-msys2.sh | 13 ++++++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e4cd59bdf96c5..6e1f0ff8ace6d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -104,7 +104,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "make dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
       - name: checkout the source code
@@ -509,7 +509,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "make dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
       - name: checkout the source code
@@ -648,7 +648,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "make dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
       - name: checkout the source code
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 4bd7ebfeaf145..15c75784eec61 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -134,7 +134,6 @@ x--expand-yaml-anchors--remove:
           path-type: inherit
           install: >
             make
-            git
             dos2unix
             diffutils
 
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
index f668223e9700f..905edf38a09db 100755
--- a/src/ci/scripts/install-msys2.sh
+++ b/src/ci/scripts/install-msys2.sh
@@ -30,8 +30,6 @@ if isWindows; then
 
     # Delete these pre-installed tools so we can't accidentally use them, because we are using the
     # MSYS2 setup action versions instead.
-    # Delete Windows-Git
-    rm -r "/c/Program Files/Git/"
     # Delete pre-installed version of MSYS2
     rm -r "/c/msys64/"
     # Delete Strawberry Perl, which contains a version of mingw
@@ -41,9 +39,18 @@ if isWindows; then
     rm -r "/c/mingw32/"
 
     if isKnownToBeMingwBuild; then
+        # Use the mingw version of CMake for mingw builds.
+        # However, the MSVC build needs native CMake, as it fails with the mingw one.
         # Delete native CMake
         rm -r "/c/Program Files/CMake/"
         # Install mingw-w64-$arch-cmake
         pacboy -S --noconfirm cmake:p
-    fi # Otherwise, the MSVC build needs native CMake, it fails with the mingw one.
+
+        # We use Git-for-Windows for MSVC builds, and MSYS2 Git for mingw builds,
+        # so that both are tested.
+        # Delete Windows-Git
+        rm -r "/c/Program Files/Git/"
+        # Install MSYS2 git
+        pacman -S --noconfirm git
+    fi
 fi