[Development] PSA: Integrations blocked in qtbase.git dev branch and some other repos
Alexandru Croitor
alexandru.croitor at qt.io
Wed Jul 10 12:09:07 CEST 2024
Hi,
There was a change that sneaked in between the qt5.git merge of SBOM activation https://codereview.qt-project.org/c/qt/qt5/+/562482/17
and a change in qtbase https://codereview.qt-project.org/c/qt/qtbase/+/564088
which will now cause changes in qtbase, and some other repos to fail to integrate in the dev branch.
List of affected repos: qtbase, qtshadertools, qtnetworkauth, qtserialport, qtcoap, qtlanguageserver, qtimageformats, qtactiveqt, qtsvg, qtdltlogging, qtserialbus.
A fix is being merged: https://codereview.qt-project.org/c/qt/qtbase/+/575575
Staging rights to qtbase.git dev branch have been locked until the fix is in, because no other changes would be able to get in anyway.
Once the fix is in, we'll restart the submodule update round from qtbase again, to quickly unblock the repos listed above.
ETA for unblocking qtbase is around 14:00 UTC. And the other repos shortly after, after the submodule update bot gets rolling.
Currently the qtdeclarative submodule update change would also be blocked because of that, but other regular changes should still integrate fine.
Sorry for the trouble.
More information about the Development
mailing list