| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Replace the current license header in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: master
Task-number: QTBUG-67283
Change-Id: I6ae743e055bbf1cf514abe604157068923fb03c6
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This dependency update script/bot has been superseded and should
be removed as it is no longer functional with modern qt6 and LTS
branches. Users are directed to the new utility via a README
left in this repo.
Change-Id: I992f64383ac1b96084d46d8c4830ac0317259a01
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The qt5 submodule update bot should ignore additionalLibrary modules
in .gitmodules. These are to be updated via other tools or manually
as needed.
Task-number: QTBUG-90668
Change-Id: I7b79cd4b7025314d91d939105dc0989aaa69843a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's possible that when starting a new round, it may be desirable
to select a specific qtbase integration sha, instead of HEAD.
This typically occurs when a submodule update round has trouble
moving forward because too many breaking changes have been applied
to qtbase.
This change allows manual section of a valid sha to serve as the
starting point for a new round.
New environment variables:
Set CUSTOM_QTBASE to select a custom qtbase without user input.
Set AUTORUN to choose qtbase/head without user input.
If neither is set, user input is required to input a sha or
accept the current head.
Change-Id: Ice633151e06797749028c9e06073563b137548d8
Reviewed-by: Toni Saario <toni.saario@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Post an alert if we give up on a module, and also post an alert if we've
found a candidate for a consistent set.
Change-Id: I49c5ffe68a9819960e90047ef87fe0f028793f24
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
| |
Let's assume that the coin-secrets repo is checked out. We can use that
for more secrets then in the future.
Change-Id: I570621b99caefee7b71bbdea7f0c38c338f8c2a5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
| |
Now that the shadertools made it into qt5 :)
Change-Id: I92eba6caf5a5ba599662908c4a0bdd8d4f3e6368
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
| |
Change-Id: Icfab559dec4aecdec8b2b50618ba3cead4ea0dc0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
When starting a new round of updates, consider the dependency
information (required, optional) from qt5.git as authoritative, instead
of re-using an existing dependencies.yaml file. This fixes the situation
where after changes to qt5.git a previous optional dependency is not
included in the default set anymore.
Change-Id: Ic7a095951a960c3c491f85dcaf3f495d0932e2d7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
| |
We still need shadertools, but now on top of the reduced qt5 set.
Change-Id: Id8b058f2a4f51bb8331e1e129f2550a3e5fbde41
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Shadertools is a dependency of qtquick3d (per yaml file), but it's not
in qt5.git yet. So the update ends up with dependency that's never
satisfied. The shadertools can't be added to qt5.git yet because it
needs an update first. So it's a deadlock.
To fix this, allow specifying a product ref in autorun.json for fetching
the list of qt5 modules. This set to the change that adds shadertools
gives the correct list of modules.
Change-Id: I03265dd4023b17d2b2860be2170c81a34c47c5aa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
| |
This is pretty plain right now, but gets the job done
Change-Id: I21bea3c065575f4c40ce2a29818a4e49fbaee366
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
This is useful when finding bugs in the updater and wanting to start from scratch
Change-Id: I7d17d09f9dfd75d78c8f816ab0e5505ab20ba9a6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Store the module update batch state in
refs/personal/<user>/state/<branch> in gerrit instead of in a local
file. That allows running the bot manually and interact well with an
automated run.
Change-Id: I10cf43e1c77bc5568c0cdb99c8fabd6fc4bd2f64
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
The gerrit status can be "open" but more likely "new", and we have to
keep the update pending.
Change-Id: I186d2c88daff727abfbeb9f332267a98cbb45acf
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
|
|
|
|
|
|
|
|
|
| |
While it's not important in the test, it makes sense to make sure all
variables are used everywhere to make staticcheck happy. In the Coin
code we had issues with shadowed error variables, so now I'm paranoid.
Change-Id: Ia5d32375b7659e048fbcd3fbebcbd6323c16123c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
| |
Change-Id: I80f7e5bc5964c00afb85c63ee7bd628295b2c6be
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
The reality is that we have flakey tests :(, so try up to three times to push an update.
Change-Id: I5af5b8f4854076eca6e31ac7c7d3fdd4f09cdffa
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
|
|
|
|
|
|
|
|
|
| |
The API allows for creating brand new index/tree objects, but the
implementation didn't take into account that git update-index expects
the file to be non-existent instead of being zero-sized.
Change-Id: I4b380154626d037da62bf05a90b62d61bc92f8ee
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
| |
We need to remove the temporary git index file used to create the qt5 commit when we're done.
Change-Id: I83e00112cd5abf289f516c1cb1b915e61ecfe463
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
Instead of ignoring these, add them to the "done" list right away. That way
they show up in the list of modules to update in qt5.git.
Change-Id: I31f02bd263d591589f6434d760f28fb73584e7bd
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
| |
This will make it easier to run the updater as a bot in the future.
Change-Id: If9944225d7d245719f198b29935e71fb9713db76
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
|
|
|
|
|
|
|
| |
function
Change-Id: Iff5416c32259dd1d7ec54834748bfdc3e018a41f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
Collect the parameters in a struct to reduce the amount of parameters to pass through.
This is done also in preparation for making the code easier when dealing with multiple batches.
Change-Id: I3bbe99286b8cf14f9f948bc27c95664d4959db08
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
| |
Make the product ref a property of the module update batch. This makes it easier to later configure the update from a config file.
Change-Id: I5642adf05b62f759e21c4c1029cd8e86f777ccbf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
|
| |
Before trying to create a new change, we query for an existing change that's open. It may happen
that that change is in integrating state, in which case we should put the module back
on the todo shelve instead of aborting with an error.
Change-Id: Ifd7141bca9dcae486f7e9b3d921343bbb9503757
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
It may happen that a dependencies update was merged by hand, in which case the script should catch up with reality
and see that the update isn't necessary. This happens automatically when the yaml file
in the repo is identical with what the bot proposes. That however in turn requires us to make
sure that we're up-to-date, so refresh the module tip before doing so.
Change-Id: I352eba235440ab0ed38bafa9f07b07be8aed0472
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
| |
Change-Id: I1164c8566612e8b7f5d95aff6218ea2b7fc21437
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
As the update bot's account does not have approver rights, do not use it to attempt
to review and stage the pushed changes, that doesn't work.
This is also how coin's propose-supermodule-update command behaves.
Change-Id: I126429c2019165159e825f1e0321b5c3bdb12fa0
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
|
|
|
|
|
|
|
| |
Add the bot key.
Change-Id: I50b9261d2eec1c3496a57e0dddb5633d909395c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
| |
The file is not called state.json anymore :)
Change-Id: I84a59430951c3103df8103ded0f71e88c66b4109
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
| |
This is only visible when running in -verbose mode
Change-Id: Ieb572f745684a61c98580f4358ce92545cafbb62
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
Centralize the conversion to the yaml string, as suggested by Aapo.
Change-Id: I22f3738686f4c5bc88a1299f023f7816ed5d4763
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
Use GIT_SSH_COMMAND instead of a wrapper script, as suggested by Aapo.
Change-Id: I4a6bffdef4aca0795a35853554ef4a2bfbc25f77
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
Separate pushing the change to Gerrit from approval and staging, as suggested by Aapo.
Change-Id: I6d4c8f620c3df4503005baaf9fb2b5fac45076e6
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
There is no need to export the summary printing function.
Change-Id: I7d585983112700ecebd4355d9464418b7281afe5
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
|
| |
The operation might fail, which should not stop us from completing the
updates.
Change-Id: I86816929558c91d0e8953512936e5b4b0c51d65b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|
|
|
|
|
|
|
| |
This tool serves the purpose of updating the dependencies.yaml files in
repositories.
Change-Id: I9b428566a4a29eda3ceecc68accfa04bd98d66cb
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
|
|
|
|
|
| |
Change-Id: I3106372c3a258d2f6bbc0924a8a376e3bbbaeaef
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This is only to provide more context for bug-fix patches that do not
have ChangeLog entries. These generally require rewriting in the
changelog anyway, but more context makes it easier.
Change-Id: Ib5141e66720bcce5e0c65d23be9a7e0ad6da547c
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
| |
Change-Id: Ib8c231adaf560352d49b4f0f248c3a8918f24754
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
| |
Change-Id: Ib3309ca1ba24e13890796a0306a024e642ace3a7
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
| |
These are separate, and are not repeated in case there _is_ a ChangeLog.
It's a manual task to distribute them into the appropriate sections afterwards.
Change-Id: I8446f7ca3607ef30636be1cba20b5027ea236cf9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
| |
Change-Id: I768d041b646e1818729d94a095001ce764a56507
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
|
| |
The raw regex from hashicorp/go-version doesn't seem to work for some
reason, even though that lib can still parse the version number after
it's been extracted.
Change-Id: Ib7b5d084e553987e0d7d35bb56c763ea31a8de0e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
| |
Change-Id: I2d99dc094ed65ad73a47dae48a35ca709788c061
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
|
|
|
|
|
|
|
|
| |
The for loop iterating over the benchmark results would essentially store the
address of the last value -- all entries would point to the same value.
Change-Id: I74ea59326a5d03d01037ae24b47b5eb184f0e34c
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
|
|
|
|
|
|
|
|
|
| |
If the sum of all changes in percent is not an integral number, then the
auto-formatting (title'ifying) of for example "16.43%" to "14 43%" looks really
odd. Disabling the auto-formatting fixes this as well as the capitalization.
Change-Id: I30cc92ac487726579f7667511cfd5d0baa69a7a6
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
|
|
|
|
|
|
|
| |
If we don't respect the tags, we may end up mixing results from different tags.
Change-Id: I0bfb9b7d685372e1c2ffbb694c4aae08612705e4
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
|
|
|
|
|
| |
Change-Id: I45cc05fb1e4dae2a5a688825501ba59e9567f7a0
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
|