Skip to content
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
894d9d5
ci(windows): use preinstalled MSYS2 + pacman-installed clang
Fedr Apr 30, 2026
84e190a
Merge remote-tracking branch 'origin/master' into ci/use-runner-msys2
Fedr Apr 30, 2026
4af6573
ci(windows): also install mingw-w64-clang-x86_64-llvm package
Fedr Apr 30, 2026
1f98820
Update mrbind.
adalisk-emikhaylov May 5, 2026
165d2c2
Generate fresh MSYS2 lockfiles.
adalisk-emikhaylov May 5, 2026
193e3e1
We no longer upload zipped MSYS2 to S3.
adalisk-emikhaylov May 5, 2026
bf25ec1
Merge branch 'master' into ci/use-runner-msys2
Fedr May 5, 2026
5a6fabf
ci(windows): make generate_win.bat fail loudly on missing MSYS2
Fedr May 5, 2026
d38cd0b
Try enabling the debug env.
adalisk-emikhaylov May 6, 2026
8070543
Hopefully fix ambiguous Python names.
adalisk-emikhaylov May 6, 2026
a1d3c5e
ci(windows): diagnostic step for embedded-python ImportError
Fedr May 7, 2026
8f978c2
Merge branch 'master' into ci/use-runner-msys2
Fedr May 8, 2026
da67406
ci(windows): drop post-Unit-Tests Python diagnostic step
Fedr May 8, 2026
e1aa051
Merge master into ci/use-runner-msys2
Fedr May 12, 2026
283d72a
ci(windows): install latest clang from MSYS2 instead of pinning clang 18
Fedr May 12, 2026
de95634
ci(windows): add mingw-w64-clang-x86_64-llvm to the install list
Fedr May 12, 2026
56177a0
ci(windows): re-add cache step (key distinct from master's clang-18 c…
Fedr May 12, 2026
2ea525d
ci(windows): add clang-tools-extra to the install list
Fedr May 12, 2026
94aad62
ci(windows): pin clang 22 via lockfile, mirroring master's clang-18 m…
Fedr May 12, 2026
7d30128
Try to fix mrbind errors.
adalisk-emikhaylov May 12, 2026
fc080a8
restore comment
Fedr May 12, 2026
4b51bd1
ci(windows): bump mrbind to MeshInspector/mrbind#33
Fedr May 12, 2026
c972ab3
ci(windows): pass -fuse-ld=lld on compile invocations too
Fedr May 12, 2026
3486404
ci(windows): pass -c to the PCH compile rule
Fedr May 13, 2026
7034db7
ci(windows): bump mrbind to capture stack trace on segfault
Fedr May 13, 2026
875577f
Update mrbind.
adalisk-emikhaylov May 13, 2026
a08ca03
Merge branch 'master' into ci/use-runner-msys2
Fedr May 13, 2026
545187f
ci(windows): bump mrbind to skip class members in buggy-substitute path
Fedr May 13, 2026
8ad38e6
Udpate mrbind.
adalisk-emikhaylov May 13, 2026
4bff6e1
Temporarily enable verbose mrbind logging.
adalisk-emikhaylov May 13, 2026
c68c6ab
Revert Claude fix.
adalisk-emikhaylov May 13, 2026
0526db2
Update mrbind to add more logs.
adalisk-emikhaylov May 13, 2026
77e4590
Update mrbind.
adalisk-emikhaylov May 13, 2026
594f6e2
Bump
adalisk-emikhaylov May 13, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/actions/install-msys2-mrbind/action.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Install MSYS2 for MRBind
description: >
Restore (or download) the clang-18 MSYS2 toolchain pinned by
`scripts/mrbind/msys2_package_hashes_clang18.txt`, sha256-verify
Restore (or download) the clang-22 MSYS2 toolchain pinned by
`scripts/mrbind/msys2_package_hashes_clang22.txt`, sha256-verify
it, and `pacman -U` against the runner's preinstalled `C:\msys64`.

runs:
Expand All @@ -13,13 +13,13 @@ runs:
uses: actions/cache@v5
with:
path: scripts/mrbind/msys2_packages
key: msys2-mrbind-clang18-${{ hashFiles('scripts/mrbind/msys2_package_hashes_clang18.txt') }}
key: msys2-mrbind-clang22-${{ hashFiles('scripts/mrbind/msys2_package_hashes_clang22.txt') }}

- name: Install MSYS2 for MRBind
# Pin clang to 18.1.8 — same version master's S3 zip ships.
# Pinning only clang/llvm causes `STATUS_DLL_NOT_FOUND` from
# cc.exe, so the lockfile carries the whole clang-18-era
# runtime stack.
# Pin clang to the version listed in msys2_package_hashes_clang22.txt
# (currently 22.1.4-3). Pinning only the clang/llvm packages fails
# with STATUS_DLL_NOT_FOUND from cc.exe; the lockfile carries the
# whole runtime stack.
shell: pwsh
run: |
C:\msys64\msys2_shell.cmd -no-start -defterm -here -c "set -e && bash scripts/mrbind/msys2_download_packages.sh _clang18 && bash scripts/mrbind/msys2_install_packages.sh _clang18"
C:\msys64\msys2_shell.cmd -no-start -defterm -here -c "set -e && bash scripts/mrbind/msys2_download_packages.sh _clang22 && bash scripts/mrbind/msys2_install_packages.sh _clang22"
2 changes: 1 addition & 1 deletion scripts/mrbind/aliases.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static const char MRBIND_UNIQUE_VAR = []
MR_ALIAS( Triangulation.vec, Triangulation.vec_ );
MR_ALIAS( TriangulationHelpersSettings, TriangulationHelpers.Settings );
MR_ALIAS( uniteCloseVertices, MeshBuilder.uniteCloseVertices );
MR_ALIAS( vectorConstMeshPtr, std_vector_const_Mesh );
MR_ALIAS( vectorConstMeshPtr, std_vector_const_Mesh_ptr );
MR_ALIAS( vectorEdges, EdgeLoop );
MR_ALIAS( VertCoords.vec, VertCoords.vec_ );
MR_ALIAS( VertScalars.vec, VertScalars.vec_ );
Expand Down
49 changes: 0 additions & 49 deletions scripts/mrbind/msys2_package_hashes_clang18.txt

This file was deleted.

55 changes: 55 additions & 0 deletions scripts/mrbind/msys2_package_hashes_clang22.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
29bfbb9783ec5b86b6a51bacbd47708f75e854a3e05b0850360dcf6e901a485d *msys2_packages/mingw-w64-clang-x86_64-brotli-1.2.0-1-any.pkg.tar.zst
95babf857eaa0853f1099201b95aa3ea7e1f3c64b29afb75e447f630a7701fd9 *msys2_packages/mingw-w64-clang-x86_64-bzip2-1.0.8-3-any.pkg.tar.zst
7ce74ebbb14c45fafb5eed8431f23d63b3ebb6a7bc5027239b1177a33c792493 *msys2_packages/mingw-w64-clang-x86_64-c-ares-1.34.6-1-any.pkg.tar.zst
abd312aeead30dcb900fcebdb981a54bf3d7147329066881799f765ea0c716da *msys2_packages/mingw-w64-clang-x86_64-ca-certificates-20250419-1-any.pkg.tar.zst
49b4bc9049002c555388bc53bbb0b4012c79ce529a3c3e57f5cd9b79a98d9343 *msys2_packages/mingw-w64-clang-x86_64-clang-libs-22.1.4-3-any.pkg.tar.zst
c23604d8f774c31ea603adf615b32f7c7ec96db4e578c8aa4b0f6194a740ffaa *msys2_packages/mingw-w64-clang-x86_64-clang-tools-extra-22.1.4-3-any.pkg.tar.zst
5f0b4ed13d3e6b7cd97d56dbcfe9dba9c43b716d5433398f1a105230f6bb9978 *msys2_packages/mingw-w64-clang-x86_64-compiler-rt-22.1.4-3-any.pkg.tar.zst
b0d254e9e9a4d5b46be98583f773a94e86fa744adce45da4d70d8c8bd9e4105e *msys2_packages/mingw-w64-clang-x86_64-cppdap-1.65-1-any.pkg.tar.zst
d3b72188041ae21bf231109d1f0e4f07859fd2d04d71553bfa3ce08e0c350fe5 *msys2_packages/mingw-w64-clang-x86_64-crt-14.0.0.r37.g2bfe61fba-1-any.pkg.tar.zst
df9d26fe7f78faed34b17fcd148240400b3ec17252680c35839254f60a0f0983 *msys2_packages/mingw-w64-clang-x86_64-curl-8.20.0-1-any.pkg.tar.zst
aded393be019d2aa70edae2000ec610c21b299f0f8fb1ffe12be5cc46e84aea5 *msys2_packages/mingw-w64-clang-x86_64-expat-2.8.1-1-any.pkg.tar.zst
67708a6ec7ace591355c261b2c2edc62092f80c820cef572fbfc3ac8725d435d *msys2_packages/mingw-w64-clang-x86_64-gettext-libtextstyle-1.0-1-any.pkg.tar.zst
6f22a64727816c9d9c8289bac9493a3c50691da678de22489d0545114568bb90 *msys2_packages/mingw-w64-clang-x86_64-gettext-runtime-1.0-1-any.pkg.tar.zst
69f2f77c6c25e9f6bb0fed4ce0df1883054282236857cd17e6eb1aa0e717470e *msys2_packages/mingw-w64-clang-x86_64-gmp-6.3.0-2-any.pkg.tar.zst
1af56214b6e0758c70c45d663e119088033049dd5dbb9a07e52490befed1c74a *msys2_packages/mingw-w64-clang-x86_64-gnutls-3.8.13-2-any.pkg.tar.zst
8046df6ba2c6b9a74e11a571e7a851b63afd599d6ae9ceaf6963b011f2ac7697 *msys2_packages/mingw-w64-clang-x86_64-headers-14.0.0.r37.g2bfe61fba-1-any.pkg.tar.zst
6c848dbb35cd559e22f44b1a1e844b9c4ec101a2c1c4075bf9fb04f523a4f1c6 *msys2_packages/mingw-w64-clang-x86_64-jsoncpp-1.9.6-3-any.pkg.tar.zst
8369032fbd3d430f0d64b6e5a1ee87899bbdf5b40cc1a45f1689e006c0190196 *msys2_packages/mingw-w64-clang-x86_64-libarchive-3.8.7-1-any.pkg.tar.zst
6f2c69f1ea27abbdb84c1e991e94dadae17a5e6d6e64859dc783f5b037edc2e2 *msys2_packages/mingw-w64-clang-x86_64-libb2-0.98.1-3-any.pkg.tar.zst
5960ecdd3c3cc058af627eac331b9ece94f9a29f8dac471e35710f32ab198c0a *msys2_packages/mingw-w64-clang-x86_64-libffi-3.5.2-1-any.pkg.tar.zst
26c4ac9f2023eecdfffb291cab40c60585a0cd0f72539ca03c5558f3ecd309ec *msys2_packages/mingw-w64-clang-x86_64-libiconv-1.19-1-any.pkg.tar.zst
91b56797068c2e73c4ee26fa89dd8e9d2de464c639f01c948c12886dbc5b138d *msys2_packages/mingw-w64-clang-x86_64-libidn2-2.3.8-4-any.pkg.tar.zst
4c73a70283a095e53c58be5e0598e3f51a92e42d7933a0dc6983c548dbe36741 *msys2_packages/mingw-w64-clang-x86_64-libpsl-0.21.5-3-any.pkg.tar.zst
65abda38e96a8a07d379bcbffd1ecb8a888655d29f09d0ec8ed00e442e02c818 *msys2_packages/mingw-w64-clang-x86_64-libssh2-1.11.1-2-any.pkg.tar.zst
964ea9469d8c71e9f44fed7aa0c437806dac3a71d4c0612046cd9243eb49b20e *msys2_packages/mingw-w64-clang-x86_64-libtasn1-4.21.0-1-any.pkg.tar.zst
5e7c731bd1db6fa508f6347689cee9335b581c84c0f6d2de155fd3792e5484b1 *msys2_packages/mingw-w64-clang-x86_64-libunistring-1.4.2-1-any.pkg.tar.zst
afc042250ab476aff151e30f6cf2fdc77483c95f3a8284053456e3d0705ceb70 *msys2_packages/mingw-w64-clang-x86_64-libunwind-22.1.4-3-any.pkg.tar.zst
6369e3755e3a724614fc2019a58edc5f6e610eed8a7cbd0089acb053b138de1b *msys2_packages/mingw-w64-clang-x86_64-libuv-1.52.1-1-any.pkg.tar.zst
e4ca02d47d02539eafff926bf15fd69b43f91f9e6600cb384fd6156dfd5879ee *msys2_packages/mingw-w64-clang-x86_64-libwinpthread-14.0.0.r37.g2bfe61fba-1-any.pkg.tar.zst
2671e2141d16bacd70aee2a3ff660318115dea367dc8b94c1ce9235ac0d34d3a *msys2_packages/mingw-w64-clang-x86_64-libxml2-2.15.3-1-any.pkg.tar.zst
b3188bc782041f2433cac02946c96c7580fe1b38f19c1f81a6c64a3805ed27b4 *msys2_packages/mingw-w64-clang-x86_64-llvm-libs-22.1.4-3-any.pkg.tar.zst
5891a6cf179df79e3d2fccfeaa57698f7763a7a106688f0c19b2d1d3f11c42af *msys2_packages/mingw-w64-clang-x86_64-llvm-tools-22.1.4-3-any.pkg.tar.zst
fe227e59fad25977ff1f7a064ddfba4a397db3a8d72f8c6c9d1dfff413b7f64f *msys2_packages/mingw-w64-clang-x86_64-lz4-1.10.0-1-any.pkg.tar.zst
e881a9cd95ca7230c25ffe015a44a38a223431cf713c50402d9975d74afeee8d *msys2_packages/mingw-w64-clang-x86_64-nettle-3.10.2-1-any.pkg.tar.zst
677fb93f51e3d149e823921f5b94f13e5eb66ba44a73a3efa64286876bc75e6e *msys2_packages/mingw-w64-clang-x86_64-nghttp2-1.69.0-1-any.pkg.tar.zst
d6b1c425fd2cf02a7d454e3648fe0456e6471f1d394ab3a249a1dfb91b09b16d *msys2_packages/mingw-w64-clang-x86_64-nghttp3-1.15.0-1-any.pkg.tar.zst
d31e58af52eb16299b65eedaa24b12f7f7c3dfb76fda6f519cc02ca06c8012c7 *msys2_packages/mingw-w64-clang-x86_64-ngtcp2-1.22.1-1-any.pkg.tar.zst
774bba6fa7785fa2e62b0d42b435181416d872070214a8b2c33cbde0c2ea879b *msys2_packages/mingw-w64-clang-x86_64-openssl-3.6.2-2-any.pkg.tar.zst
5991b8f800f1dcf0af450df91a4e7611aaa604a17197659d1515a08abff6480b *msys2_packages/mingw-w64-clang-x86_64-p11-kit-0.26.2-1-any.pkg.tar.zst
f60b8c6c7b74bf2caa57533a41d28d8a815067ed3987c3be19cc1db228b41c3e *msys2_packages/mingw-w64-clang-x86_64-pcre2-10.47-1-any.pkg.tar.zst
6b25519602ce5e799805b3a3c1ade81184b5a7ee2e4b815cd47ce6a2da7b3aeb *msys2_packages/mingw-w64-clang-x86_64-pkgconf-1~2.5.1-1-any.pkg.tar.zst
4ea744fa603b3198fa69d1051ddc95aa5de9c7b503dd01d35eeb1b916e8a505e *msys2_packages/mingw-w64-clang-x86_64-rhash-1.4.6-1-any.pkg.tar.zst
853aa831a43b781c157181c6bd35589014721e864d823f0c0a13dc80ba0a2d75 *msys2_packages/mingw-w64-clang-x86_64-wineditline-2.208-1-any.pkg.tar.zst
581342a1aa103063458b34d0d66987ed8599ce3a813c7b45e3e6ae79c8ccecd8 *msys2_packages/mingw-w64-clang-x86_64-winpthreads-14.0.0.r37.g2bfe61fba-1-any.pkg.tar.zst
dcb1c33adab5dc89ab4adab1cb7e09e01417b6ea4bacfb3224d276b579dc617b *msys2_packages/mingw-w64-clang-x86_64-xz-5.8.3-1-any.pkg.tar.zst
96d8db2f2bf24c0d4e82b899d50a3497d97536a8bd38ce275401d0f2b9580b5e *msys2_packages/mingw-w64-clang-x86_64-zlib-1.3.2-2-any.pkg.tar.zst
2d75c4ddf8f4f7b76fe33e3f1eea16450f9b3aede14285c886462d72f0ffd87d *msys2_packages/mingw-w64-clang-x86_64-zstd-1.5.7-2-any.pkg.tar.zst
2408af61717dae87b00c855b132769a125c708907fc94a46bb16dae076113e5c *msys2_packages/make-4.4.1-2-x86_64.pkg.tar.zst
52b9b26133beedff90fea19c9efd1751e5eb17f776680a41af768ab863cf516d *msys2_packages/mingw-w64-clang-x86_64-clang-22.1.4-3-any.pkg.tar.zst
a1da67bc86d797a40e74fb57cd2f945aa90fbcc819b8721780daf8e731f4d2f7 *msys2_packages/mingw-w64-clang-x86_64-cmake-4.3.2-4-any.pkg.tar.zst
d174d2d6b8a1febd97535ac6661e0775f6a494f4ddb9136ec26023cd82b219bd *msys2_packages/mingw-w64-clang-x86_64-gettext-tools-1.0-1-any.pkg.tar.zst
c37c97d3e29636b3a30c98f91d78f2d9b9a2e70fbf77e9f45b298f002afdb85f *msys2_packages/mingw-w64-clang-x86_64-libc++-22.1.4-3-any.pkg.tar.zst
d409baec1d7192c0783e24bdfb4c8281c9ee2dd22e7ebf1118676fd69f9af236 *msys2_packages/mingw-w64-clang-x86_64-lld-22.1.4-3-any.pkg.tar.zst
f095b10d91fd40e98de94c97cf6b8d73e034820466999c9837fbe1f56f1a5b97 *msys2_packages/mingw-w64-clang-x86_64-llvm-22.1.4-3-any.pkg.tar.zst
dbb68154241fc24df9c176f605712f6f2491226f8c495627e95201c149a49a65 *msys2_packages/mingw-w64-clang-x86_64-ninja-1.13.2-1-any.pkg.tar.zst
2 changes: 1 addition & 1 deletion thirdparty/mrbind
Loading