Bump expected LLVM version to 24#27349
Conversation
|
@sbc100 how do we get around the version mismatch? tot has the new version but this repo now rolls a day late. I guess we need to wait for that roll..? |
|
(will the roll actually pass?) |
|
Hmm.. we have logic that allows this to pass the emscripten-releases CI, but i looks like we need to update the scheme now that we roll emsdk on our end: Lines 240 to 245 in ee5cacb I suppose for this initial change you could include and emsdk update as part of this change? i.e. combine the emsdk update with the llvm update? I guess that actually makes the most sense here because they are intrinsically linked. |
|
One option here would be to manually trigger an emsdk update here: https://github.com/emscripten-core/emscripten/actions/workflows/update-emsdk.yml Then when the CI fails, push the LLVM bump into that PR? We could make the emsdk update script clever enough to do this on its own, but since its only once ever 6 months maybe its not worth it? |
|
Actually because essentially the same logic need to apply to llvm and binaryen here I think we can/should build it into the --update-emsdk process.. looking into that now. |
|
I created #27352. Once that lands we can trigger the action it should update the versions for us. |
…yen version bumps (#27352) When running `tools/maint/rebaseline_tests.py --update-emsdk`, check both the LLVM version and Binaryen version in the currently installed SDK (`get_clang_version` and `get_binaryen_version`), and automatically patch `EXPECTED_LLVM_VERSION` in `tools/shared.py` and `EXPECTED_BINARYEN_VERSION` in `tools/building.py` if they differ. Also update `check_binaryen` in `tools/building.py` so it has the same buildbot handling (`BUILDBOT_BUILDNUMBER`) as `check_llvm_version`, only allowing `EXPECTED_BINARYEN_VERSION + 1` in CI environments. We should probably split up this script since its doing a lot more than rebaselining tests at this point, but I'll leave that for a followup. See #27349
|
OK to close this in favor of the auto-generated PR: #27353 |
Emsdk tot started to warn on this: