Skip to content

Commit 481cc81

Browse files
committed
Fix Windows ARM64 wheels and bump bundled libraries
Windows ARM64 wheel builds have failed since the windows-11-arm runner moved to the VS2026 image (MSVC 14.44 -> 14.51) with C1047: the prebuilt iconv_a.lib was compiled with /GL, which only links with the exact same compiler build. - Download Windows libs from win-binaries release 2026.10.23, where libiconv is built without /GL. - Run the AMD64 Windows jobs on windows-2025-vs2026, since the libs are now built with VS2026 and need a linker at least that new. - Windows libs: iconv 1.19-1, libxml2 2.11.9-8, libxslt 1.1.45, openssl 3.5.9, xmlsec 1.3.12, zlib 1.3.2. - Unix libs: libiconv 1.19, openssl 3.6.5, xmlsec1 1.3.12, zlib 1.3.2. libxml2 stays at 2.14.6 to match lxml, and libxslt stays at 1.1.43 because 1.1.44+ requires libxml2 >= 2.15.1.
1 parent c9562fe commit 481cc81

3 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎.github/workflows/cache_libs.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_call:
55
inputs:
66
LIBICONV_VERSION:
7-
default: "1.18"
7+
default: "1.19"
88
required: false
99
type: string
1010
LIBXML2_VERSION:
@@ -16,39 +16,39 @@ on:
1616
required: false
1717
type: string
1818
OPENSSL_VERSION:
19-
default: "3.6.0"
19+
default: "3.6.5"
2020
required: false
2121
type: string
2222
XMLSEC1_VERSION:
23-
default: "1.3.11"
23+
default: "1.3.12"
2424
required: false
2525
type: string
2626
ZLIB_VERSION:
27-
default: "1.3.1"
27+
default: "1.3.2"
2828
required: false
2929
type: string
3030
WIN_LIBICONV_VERSION:
31-
default: "1.18-1"
31+
default: "1.19-1"
3232
required: false
3333
type: string
3434
WIN_LIBXML2_VERSION:
35-
default: "2.11.9-3"
35+
default: "2.11.9-8"
3636
required: false
3737
type: string
3838
WIN_LIBXSLT_VERSION:
39-
default: "1.1.39"
39+
default: "1.1.45"
4040
required: false
4141
type: string
4242
WIN_OPENSSL_VERSION:
43-
default: "3.5.6"
43+
default: "3.5.9"
4444
required: false
4545
type: string
4646
WIN_XMLSEC1_VERSION:
47-
default: "1.3.11"
47+
default: "1.3.12"
4848
required: false
4949
type: string
5050
WIN_ZLIB_VERSION:
51-
default: "1.3.1"
51+
default: "1.3.2"
5252
required: false
5353
type: string
5454

@@ -87,7 +87,7 @@ jobs:
8787
- "ubuntu-22.04"
8888
- "ubuntu-22.04-arm"
8989
- "macos-latest"
90-
- "windows-2022"
90+
- "windows-2025-vs2026"
9191
- "windows-11-arm"
9292

9393
runs-on: ${{ matrix.os }}

‎.github/workflows/wheels.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
&& cibuildwheel --print-build-identifiers --platform macos \
9797
| jq -nRc '{"only": inputs, "os": "macos-latest"}' \
9898
&& cibuildwheel --print-build-identifiers --platform windows \
99-
| jq -nRc '{"only": inputs, "os": "windows-2022"}' \
99+
| jq -nRc '{"only": inputs, "os": "windows-2025-vs2026"}' \
100100
&& cibuildwheel --print-build-identifiers --platform windows --archs ARM64 \
101101
| jq -nRc '{"only": inputs, "os": "windows-11-arm"}'
102102
} | jq -sc

‎build_support/lib_xmlsec_dependency_builder.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def triplet(self) -> str:
3636

3737

3838
class LibXmlsecDependencyBuilder:
39-
WINDOWS_LIBS_DOWNLOAD_RELEASE_URL = 'https://github.com/mxamin/python-xmlsec-win-binaries/releases/download/2026.04.28/'
39+
WINDOWS_LIBS_DOWNLOAD_RELEASE_URL = 'https://github.com/mxamin/python-xmlsec-win-binaries/releases/download/2026.10.23/'
4040
LIB_VERSION_ENV_VARS: ClassVar[dict[str, str]] = {
4141
'libiconv_version': 'PYXMLSEC_LIBICONV_VERSION',
4242
'libxml2_version': 'PYXMLSEC_LIBXML2_VERSION',
@@ -46,20 +46,20 @@ class LibXmlsecDependencyBuilder:
4646
'zlib_version': 'PYXMLSEC_ZLIB_VERSION',
4747
}
4848
UNIX_DEFAULT_LIB_VERSIONS: ClassVar[dict[str, str]] = {
49-
'libiconv_version': '1.18',
49+
'libiconv_version': '1.19',
5050
'libxml2_version': '2.14.6', # Make sure it matches with lxml
51-
'libxslt_version': '1.1.43',
52-
'openssl_version': '3.6.0',
53-
'xmlsec1_version': '1.3.11',
54-
'zlib_version': '1.3.1',
51+
'libxslt_version': '1.1.43', # 1.1.44+ requires libxml2 >= 2.15.1
52+
'openssl_version': '3.6.5',
53+
'xmlsec1_version': '1.3.12',
54+
'zlib_version': '1.3.2',
5555
}
5656
WINDOWS_DEFAULT_LIB_VERSIONS: ClassVar[dict[str, str]] = {
57-
'libiconv_version': '1.18-1',
58-
'libxml2_version': '2.11.9-3', # Make sure it matches with lxml
59-
'libxslt_version': '1.1.39',
60-
'openssl_version': '3.5.6',
61-
'xmlsec1_version': '1.3.11',
62-
'zlib_version': '1.3.1',
57+
'libiconv_version': '1.19-1',
58+
'libxml2_version': '2.11.9-8', # Make sure it matches with lxml
59+
'libxslt_version': '1.1.45',
60+
'openssl_version': '3.5.9',
61+
'xmlsec1_version': '1.3.12',
62+
'zlib_version': '1.3.2',
6363
}
6464

6565
def __init__(self, platform_name, info=None, libs_dir=None, buildroot=None, plat_name=None):

0 commit comments

Comments
 (0)