diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2021-10-08 12:49:46 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-25 14:55:34 +0000 |
| commit | d742a858c3aab3bcd68cf51a684269bde5995658 (patch) | |
| tree | bba924769d1fb0ca97083552b653b0e6210d5414 /conanfile.py | |
| parent | cae5e3c348ac724ef4ded36dd79fb26f2ce0fde1 (diff) | |
Change package_revision_mode() to recipe_revision_mode()
The package_revision_mode() is too strict for Qt CI.
This mode includes artifacts checksum in package_id which is
problematic in Qt CI re-runs (re-run flaky build) which contain
different build timestamps (cmake) which end up in library
files -> different package_id.
The effect was that Conan/Conan server is unable to re-use correct
binaries and re-builds (re-staged) dependencies.
Change-Id: Id54af7455b948c8d68b7206d524f1d0fcfb7b568
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 623e396e881f383950b78518a193aff602d8568e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'conanfile.py')
| -rw-r--r-- | conanfile.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/conanfile.py b/conanfile.py index 4d2af9047a..e43dd20983 100644 --- a/conanfile.py +++ b/conanfile.py @@ -445,7 +445,13 @@ class QtBase(ConanFile): def package_id(self): # https://docs.conan.io/en/latest/creating_packages/define_abi_compatibility.html - self.info.requires.package_revision_mode() + + # The package_revision_mode() is too strict for Qt CI. This mode includes artifacts + # checksum in package_id which is problematic in Qt CI re-runs (re-run flaky + # build) which contain different build timestamps (cmake) which end up in library + # files -> different package_id. + self.info.requires.recipe_revision_mode() + # Enable 'qt-conan-common' updates on client side with $conan install .. --update self.info.python_requires.recipe_revision_mode() |