diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32e33741..5b55515b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,11 +72,6 @@ jobs: - os: macos-13 - os: macos-14 - os: macos-15 - - os: windows-2019 - - os: windows-2019 - bash: msys64 - - os: windows-2019 - bash: cygwin - os: windows-2022 - os: windows-2022 bash: msys64 diff --git a/tools/ci/tool-list.sh b/tools/ci/tool-list.sh index 827cf9f4..3b926c7d 100755 --- a/tools/ci/tool-list.sh +++ b/tools/ci/tool-list.sh @@ -48,9 +48,6 @@ glibc_pre_2_17_incompat=( musl_incompat=( "${glibc_pre_2_17_incompat[@]}" ) -win2019_gnu_incompat=( - cargo-spellcheck -) incompat_tools=() case "${1:-}" in @@ -65,8 +62,6 @@ case "${1:-}" in exit 1 ;; esac -runner="${2:-}" -bash="${3:-}" case "$(uname -s)" in Linux) host_os=linux @@ -115,16 +110,7 @@ case "$(uname -s)" in fi ;; Darwin) host_os=macos ;; - MINGW* | MSYS* | CYGWIN* | Windows_NT) - host_os=windows - case "${bash}" in - msys64 | cygwin) - if [[ "${runner}" == "windows-2019" ]]; then - incompat_tools+=("${win2019_gnu_incompat[@]}") - fi - ;; - esac - ;; + MINGW* | MSYS* | CYGWIN* | Windows_NT) host_os=windows ;; *) bail "unrecognized OS type '$(uname -s)'" ;; esac # See main.sh