Cleanup custom mingw in CI

Author: ChrisDenton

.github/workflows/ci.yml

@@ -155,9 +155,6 @@ jobs:
       - name: checkout submodules
         run: src/ci/scripts/checkout-submodules.sh
 
-      - name: install MSYS2
-        run: src/ci/scripts/install-msys2.sh
-
       - name: install MinGW
         run: src/ci/scripts/install-mingw.sh
 

src/ci/github-actions/jobs.yml

@@ -378,7 +378,6 @@ auto:
       # 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
 
   - image: x86_64-mingw
@@ -390,7 +389,6 @@ auto:
       # 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
 
   - image: dist-x86_64-msvc
@@ -439,7 +437,6 @@ auto:
       # 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
 
@@ -453,7 +450,6 @@ auto:
       # 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
 

src/ci/scripts/install-mingw.sh

@@ -38,13 +38,9 @@ if isWindows && isKnownToBeMingwBuild; then
             ;;
     esac
 
-    if [[ "${CUSTOM_MINGW:-0}" == 0 ]]; then
-        pacman -S --noconfirm --needed mingw-w64-$arch-toolchain
-    else
-        mingw_dir="mingw${bits}"
+    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