Merge in the main branch

Author: encukou

master/custom/builders.py

@@ -174,10 +174,6 @@
     ("AMD64 FreeBSD Refleaks", "ware-freebsd", UnixRefleakBuild),
     ("AMD64 FreeBSD14", "opsec-fbsd14", UnixBuild),
 
-    # Windows aarch64 MSVC
-    ("ARM64 Windows", "linaro-win-arm64", WindowsARM64Build),
-    ("ARM64 Windows Non-Debug", "linaro-win-arm64", WindowsARM64ReleaseBuild),
-
     # iOS
     ("iOS ARM64 Simulator", "rkm-arm64-ios-simulator", IOSARM64SimulatorBuild),
 
@@ -322,6 +318,11 @@
     ("AMD64 FreeBSD15", "opsec-fbsd15", UnixBuild),
     # FreeBSD 16 is CURRENT: development branch (at 2026-01-09)
     ("AMD64 FreeBSD16", "opsec-fbsd16", UnixBuild),
+
+    # Windows aarch64 MSVC
+    ("ARM64 Windows", "ware-win11-arm64", WindowsARM64Build),
+    ("ARM64 Windows Non-Debug", "ware-win11-arm64", WindowsARM64ReleaseBuild),
+
 ]
 
 

master/custom/workers.py

@@ -294,9 +294,9 @@ def get_workers(settings):
             parallel_tests=2,
         ),
         cpw(
-            name="linaro-win-arm64",
-            tags=['windows', 'arm64'],
-            parallel_tests=4,
+            name="ware-win11-arm64",
+            tags=['windows', 'win11', 'arm64'],
+            parallel_tests=2,
         ),
         cpw(
             name="bcannon-wasi",