[Development] New features in CI

Giuseppe D'Angelo giuseppe.dangelo at kdab.com
Sat Mar 27 11:23:12 CET 2021


On 12/03/2021 17:22, Tor Arne Vestbø wrote:
> We we please improve this by:
>   1. Attempt to cherry-pick the commits in the tested branch into dev, 
> before falling back to a merge commit (if needed)
>   2. If we need to merge:
>     - Reflecting the CI as the author of the merge commit
>     - Reflecting the set of commits in the merge commit message, e.g. 
> based on git shortlog
>     - Using a commit message subject that explains what’s going on, eg.

This situation is getting a bit out of hand, with a now almost half of 
commits in qtbase/dev being merge commits. I'm not quite convinced this 
is a good thing.


Giuseppe D'Angelo | giuseppe.dangelo at kdab.com | Senior Software Engineer
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53, http://www.kdab.com
KDAB - The Qt, C++ and OpenGL Experts

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4329 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.qt-project.org/pipermail/development/attachments/20210327/51b722b4/attachment.bin>

More information about the Development mailing list