Skip to content

Commit 93a4d9a

Browse files
committed
Drop the Windows host nobody ships
i686-w64-mingw32 was declared `packaged: false`, which is describe's way of saying it does not go in a release, and it is nobody's build machine either -- so prune_hosts has been leaving it out of every lock since the lock existed. No snapshot has ever carried it: forty releases of vitasdk/autobuilds, none with an i686 asset. What kept building it was the hand-written matrix, which uploaded vitasdk-windows-i686 and then had no job download it. It expired fourteen days later, every run, unread. So this is not a host being retired; it is a row, a toolchain file and a build recipe that describe stopped honouring a while ago. The lock is ten hosts before this commit and ten after.
1 parent bf65cd5 commit 93a4d9a

6 files changed

Lines changed: 1 addition & 30 deletions

File tree

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ Available host toolchain files under `cmake/toolchains/`:
200200
| File | Host | Notes |
201201
| --- | --- | --- |
202202
| `x86_64-w64-mingw32.cmake` | Windows x86_64 | mingw-w64 |
203-
| `i686-w64-mingw32.cmake` | Windows i686 | mingw-w64 |
204203
| `aarch64-linux-gnu.cmake` | Linux aarch64 (glibc) | alternative to a native arm64 build |
205204
| `x86_64-unknown-freebsd.cmake` | FreeBSD x86_64 | clang + base.txz sysroot, see `scripts/setup-freebsd-cross.sh` |
206205
| `aarch64-unknown-freebsd.cmake` | FreeBSD aarch64 | clang + base.txz sysroot, see `scripts/setup-freebsd-cross.sh` |

cmake/hosts.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
{"name": "aarch64-linux-musl", "stage": 2, "runner": "ubuntu-24.04-arm", "container": null, "packaged": true},
99
{"name": "x86_64-w64-mingw32", "stage": 3, "runner": "ubuntu-24.04", "container": null, "packaged": true, "build_host": "x86_64-linux-gnu"},
1010
{"name": "x86_64-apple-darwin", "stage": 3, "runner": "macos-14", "container": null, "packaged": true, "build_host": "arm64-apple-darwin"},
11-
{"name": "i686-w64-mingw32", "stage": 3, "runner": "ubuntu-24.04", "container": null, "packaged": false, "build_host": "x86_64-linux-gnu"},
1211
{"name": "x86_64-unknown-freebsd", "stage": 3, "runner": "ubuntu-24.04", "container": null, "packaged": true, "build_host": "x86_64-linux-gnu"},
1312
{"name": "aarch64-unknown-freebsd", "stage": 3, "runner": "ubuntu-24.04", "container": null, "packaged": true, "build_host": "x86_64-linux-gnu"}
1413
]

cmake/toolchains/i686-w64-mingw32.cmake

Lines changed: 0 additions & 20 deletions
This file was deleted.

scripts/ci/build-host.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ install_dependencies() {
319319
local -a extra=()
320320
case $host in
321321
x86_64-w64-mingw32) extra=(g++-mingw-w64-x86-64) ;;
322-
i686-w64-mingw32) extra=(g++-mingw-w64-i686) ;;
323322
x86_64-unknown-freebsd | aarch64-unknown-freebsd) extra=(clang lld llvm) ;;
324323
esac
325324
${sudo_cmd[@]+"${sudo_cmd[@]}"} apt-get update -qq
@@ -393,10 +392,6 @@ x86_64-w64-mingw32)
393392
install_dependencies
394393
extra_cmake_args+=(-DCMAKE_TOOLCHAIN_FILE="$repo_root/cmake/toolchains/x86_64-w64-mingw32.cmake")
395394
;;
396-
i686-w64-mingw32)
397-
install_dependencies
398-
extra_cmake_args+=(-DCMAKE_TOOLCHAIN_FILE="$repo_root/cmake/toolchains/i686-w64-mingw32.cmake")
399-
;;
400395
x86_64-unknown-freebsd)
401396
install_dependencies
402397
scripts/setup-freebsd-cross.sh 14.3 "$PWD/freebsd-cross" x86_64

tests/cmake/published-host-name.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ assert_published(aarch64-unknown-freebsd14 aarch64-unknown-freebsd)
1616
# Every other host publishes under the triplet it builds with.
1717
foreach(triplet x86_64-linux-gnu aarch64-linux-gnu x86_64-linux-musl
1818
aarch64-linux-musl arm64-apple-darwin x86_64-apple-darwin
19-
x86_64-w64-mingw32 i686-w64-mingw32)
19+
x86_64-w64-mingw32)
2020
assert_published("${triplet}" "${triplet}")
2121
endforeach()
2222

toolchain-i686-w64-mingw32.cmake

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)