summaryrefslogtreecommitdiff
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* Make querying internal coin safe and use configurable hostnameDaniel Smith2023-04-173-3/+11
| | | | | | | | | | | | | It turns out Requests will throw an exception if the hostname cannot be resolved. Handle this error gracefully and fall back. Further, if we failed to query coin for some reason, automatic staging should only be disabled for blocking modules being updated since automatic staging is a global behavior of the bot. Change-Id: I2fbb744576dd5ec946f9738875b0bc4ac0191874 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Exclude Yocto and Qt5.git from providing a dependencies listDaniel Smith2023-04-171-0/+2
| | | | | Change-Id: I6c95069e51bff35f78b1a80bd9cbbf3f2d85d67c Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Fix variable name for accessing state_dataDaniel Smith2023-04-171-2/+2
| | | | | | | | | In some situations, the bot will request the proposed dependencies.yaml from a finished module, but this logic uses an incorrect variable and crashes. Change-Id: Idd29211edc0b2bee863a5ab03cc41b63000c46c6 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Retry failed staging once in submodule updatesDaniel Smith2023-04-171-30/+46
| | | | | | | | | | | | | | | The submodule update bot is not capable of determining a proper patch-application order for patches to be co-staged with the submodule update. As a result, some conflicts may be created due to blindly staging changes. This can be somewhat alleviated by retrying failed items once before giving up such that necessary dependencies are staged before the dependent ones. This brute-force staging method should be suitable for the majority of cases but may still occasionally result in failed co-staging when the count of dependent changes is too large. Change-Id: Idf6bd929eb89b6d6b25f6d0885f225b1a8b83c00 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Fix Teams Card buttons for current version of the teams python libDaniel Smith2023-04-171-33/+19
| | | | | | | | A recent update broke the expected format of button payloads. Update it to create properly formatted JSON strings. Change-Id: If07df122c7c8090c18c5fabfcc9480c6dda83b13 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update how the submodule update handles failed modulesDaniel Smith2023-04-175-48/+114
| | | | | | | | | | | | The bot should watch for state updates of failed modules in the event they are manually integrated after having been marked as failed. This patch also introduces an additional repo status of DONE_FAILED_DEPENDENCY to better differentiate between actual failed modules, and those which were marked as failed due to bad dependencies. Change-Id: I8b949aa32cef109a51d7b53f7bc9942186034959 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Add ability to prune branches from state fileDaniel Smith2023-04-172-26/+66
| | | | | | | | | Without pruning, the state file will grow quite large over time. Add a parameter to allow pruning of all or some branches from the state file to minimize this issue. Change-Id: I61155f4aa11a36bfd6da151173fb0b694fc7103a Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update python-gerrit-api referenceDaniel Smith2023-04-171-1/+1
| | | | | | Change-Id: I3d474389c3f91a609aac1296e5f13df00c742ba0 Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io> Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* flake8: fix style issuesCristián Maureira-Fredes2022-12-1910-81/+86
| | | | | | | | | | | | | | flake8 reported a few issues, and there were other details we could improve, like using more f-strings, avoiding breaking some lines with '\' at the end and using round parenthesis instead, and complicated long lines that could be split a bit. Some function signatures were also long enough to split them into one argument per line, in favor to display the type annotation on the last line Change-Id: I5f65f6c52ac3f2f36488d26a0cb46b8f7c9fff82 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-0712-456/+24
| | | | | | | | | | Replace the current license header in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I385751ca6bdcb72ccf69d5cfefc97acba836135b Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Handle yocto/meta-qt6 LTS branches as public branchesDaniel Smith2022-05-041-3/+12
| | | | | | | | | | | | | | | If the script is being run with a tqtc/lts-* branch, this should be consistent across all repos except for yocto/meta-qt6 which has no tqtc/ shadow repo and tqtc/lts-* branches. Handle these branches in the public repo instead. It can be expected that lts branches in the public repo are always prefixed as lts-* This change also includes a drive-by fix to ensure the correct qt5 repo is updated, taking repo prefixes into account. Change-Id: I6a8360a6ea682d96882d137b834eea11188c758f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Have the Submodule Update Utility catch manually merged updatesDaniel Smith2022-03-302-6/+14
| | | | | | | | | | | | | If a change is manually merged after the utility has marked it as failed, the utility should pick up on this so the round can continue automatically without further user action. This change also updates calls to any() to directly pass an iterator rather than computing a value set through list comprehension. Change-Id: I18a5511de30e92e4276ef596c8ae2011f297dd63 Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
* Ignore failed log parsing attempts in Submodule Update UtilityDaniel Smith2022-03-141-1/+6
| | | | | | | | | | | Log parsing can fail to decode the response if the content type is incorrectly set. Due to the storage location of some LTS branch build/test logs, the files are incorrectly served as binary data. Ignore these decoding failures, as the storage location for future logging will set the content type headers correctly. Change-Id: I2b0bb3a23505a19991f8a49e3a5117cf48d208ca Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Say hello to the new Dependency Update UtilityDaniel Smith2022-02-2118-0/+3240
| | | | | | | | | | | | | | | This replaces the script/bot at qt/qtqa/src/qtmoduleupdater with a more extensible utility. While this utility can be plugged into an automation host like Jenkins to act as a bot, it may also be used as a standalone tool to bring any repo's dependencies up-to-date with qt/qt5.git or dependency repo HEADs. See the included README.md for further description of capabilities, use cases and examples. Task-number: QTQAINFRA-4594 Change-Id: I6e21f90e410044561bfa4d0dfa72cd09687de321 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove unused util fixnonlatinDavid Skoland2021-03-222-104/+0
| | | | | | | | This is obsolete (Qt is entirely UTF-8 now) Change-Id: I8931e6529b53072c64a95f359c0d91a5b7669dce Task-number: QTQAINFRA-1958 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* normalize: Respect keyword bounds for SIGNAL/SLOTJoerg Bornemann2019-01-311-0/+11
| | | | | | | | | | This tool tried to normalize signatures for things like Q_PRIVATE_SLOT and SIGNAL_INDEX. Check for valid keyword characters before and after the search string. Fixes: QTBUG-38172 Change-Id: I9b7e31d5b283da23ecbbe87e9e670a62e4f53ae7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Unify license header usageAntti Kokko2016-02-032-28/+40
| | | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: Ic9b7de3ff8ad0e6f1c8477ced3d07f7e90f3dae9 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-112-14/+14
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: If3c8d221bcf8e5010048ed5f1c50cd35c04e7199 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update license headers and add new licensesJani Heikkinen2014-08-242-38/+22
| | | | | | | | - Added LICENSE.LGPLv21, LICENSE.LGPLv3 & LICENSE.GPLv2 Change-Id: If5b04ddf25095ae1eb59e25361c88e570bb2b4df Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* normalize: remove wrong assert.David Faure2013-12-091-1/+0
| | | | | | | | Many C++ source files don't end with a '\n' Change-Id: I785ee0ac0678f63ae41b2bcaddc77bc4c3e5c16e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Port `normalize` to QCommandLineParser, to fix its compilation.David Faure2013-12-061-17/+23
| | | | | | | app.argc() doesn't exist anymore. Change-Id: Ia4e871e673f819e85d41d4eabe04987a57313995 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* update copyright yearOswald Buddenhagen2013-02-112-2/+2
| | | | | Change-Id: I670423c6001e2a504df8be80b42ee88566ad3baa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove unnecessary CONFIG additionOswald Buddenhagen2012-12-141-1/+1
| | | | | | | warn_on is already added by default_pre.prf. Change-Id: I0da03963edf7f3196638a238b66bd5bfde492795 Reviewed-by: hjk <qthjk@ovi.com>
* Change copyright info from Nokia to DigiaSergio Ahumada2012-11-281-1/+1
| | | | | Change-Id: I1cec04e8763c6102b485638058df37d9093ed859 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-09-262-47/+49
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I5b63c06bf0e6e45f5b00669f749e5e136ddc2f9d Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-212-13/+4
| | | | | | | remove assignmets which are defaults or bogus Change-Id: Ie4b56bd12cd2c6b9762fe242309c3bfe96f00ad1 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-302-2/+2
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I15becdbdde2d4719f1411ba3d8306983cfba0e11 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-232-2/+2
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie3419ce67907b27514e493aa123e4e266b0f59aa Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-052-2/+2
| | | | | Change-Id: I8d2cc9e590c54109fc86093274995f9e9508a768 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qtrepotools Qt moduleJyri Tahtela2011-05-242-34/+34
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Initial import from the monolithic Qt.Qt by Nokia2011-04-275-0/+329
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12