From 623e396e881f383950b78518a193aff602d8568e Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Fri, 8 Oct 2021 12:49:46 +0300 Subject: 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. Pick-to: 6.2 6.2.1 Change-Id: Id54af7455b948c8d68b7206d524f1d0fcfb7b568 Reviewed-by: Toni Saario --- conanfile.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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() -- cgit v1.2.3