diff options
| author | James Ennis <james.ennis@codethink.co.uk> | 2019-08-14 15:42:22 +0100 |
|---|---|---|
| committer | James Ennis <james.ennis@codethink.com> | 2019-08-19 09:11:45 +0000 |
| commit | 1c560e5641d2121e88b6671e9a11a7e505e50b56 (patch) | |
| tree | 5763fadfa57d46cae9f06869f84690b92059bd65 | |
| parent | 124bb87336ae1341b56015f925041919f9562e97 (diff) | |
| download | buildstream-jennis/add_dep_name_to_cache_key.tar.gz | |
element.py: Add the build dependency names to the cache key dictjennis/add_dep_name_to_cache_key
We store the build dependency names in the artifact proto. This
should be reflected in the cache key dict.
| -rw-r--r-- | src/buildstream/element.py | 3 | ||||
| -rw-r--r-- | tests/cachekey/project/elements/compose1.expected | 2 | ||||
| -rw-r--r-- | tests/cachekey/project/elements/compose2.expected | 2 | ||||
| -rw-r--r-- | tests/cachekey/project/elements/compose3.expected | 2 | ||||
| -rw-r--r-- | tests/cachekey/project/elements/compose4.expected | 2 | ||||
| -rw-r--r-- | tests/cachekey/project/elements/compose5.expected | 2 | ||||
| -rw-r--r-- | tests/cachekey/project/elements/script1.expected | 2 | ||||
| -rw-r--r-- | tests/cachekey/project/target.expected | 2 |
8 files changed, 9 insertions, 8 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py index f28f482ba..64686bf51 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -3111,7 +3111,8 @@ class Element(Plugin): if self.__strict_cache_key is None: dependencies = [ - e.__strict_cache_key for e in self.dependencies(Scope.BUILD) + [e.name, e.__strict_cache_key] if e.__strict_cache_key is not None else None + for e in self.dependencies(Scope.BUILD) ] self.__strict_cache_key = self._calculate_cache_key(dependencies) diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected index 8d00e5c44..39db43d4f 100644 --- a/tests/cachekey/project/elements/compose1.expected +++ b/tests/cachekey/project/elements/compose1.expected @@ -1 +1 @@ -e91019742fc42fb6758d0204e62179522fe886712657ae0e56a544c073e76330
\ No newline at end of file +11231af4d04d1839e27c8589c2e6c978eb3280f237a62055306fba11a9569ae4
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected index a45e2d114..7a7f955c6 100644 --- a/tests/cachekey/project/elements/compose2.expected +++ b/tests/cachekey/project/elements/compose2.expected @@ -1 +1 @@ -d33107bfa4197b45ba934926829ffcab207cb14885e57541b4d73a7811ef6d23
\ No newline at end of file +5fc1c9523684535fab2dd8e6dc2bfea09429b78029e933e7293b5afa12fb50f5
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected index 6296f5acd..c3fdaea14 100644 --- a/tests/cachekey/project/elements/compose3.expected +++ b/tests/cachekey/project/elements/compose3.expected @@ -1 +1 @@ -603c482bc6b35a30916c5f9404089decb31744518e07bd4488883f0ce3ffce94
\ No newline at end of file +9c1c0c3325c1ebb8c5a70f4b973f41f49a07250dc04c7f5525021cd74b7f89a1
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected index ea50ddf9d..f3fa08a67 100644 --- a/tests/cachekey/project/elements/compose4.expected +++ b/tests/cachekey/project/elements/compose4.expected @@ -1 +1 @@ -433c0e5b6c0eeeb042e3f6ac39819847c424d104b0cf2ccb7ee48a2eba5bec2e
\ No newline at end of file +d0637fbd5a4b74dff1165057ebc90ded15086685be1ca63051a5f4bdbfaff345
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected index 778ddf9fa..6e0a58a54 100644 --- a/tests/cachekey/project/elements/compose5.expected +++ b/tests/cachekey/project/elements/compose5.expected @@ -1 +1 @@ -35c484d8deb9cb0f8f8a8ec1c3306a0b43846df7d658aa4bfff5d4ff146b98e3
\ No newline at end of file +ca3ac39541ae2a1195b84acfbb75bd4e760204b4c721571758066455cd870419
\ No newline at end of file diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected index a39f5b473..d38132abf 100644 --- a/tests/cachekey/project/elements/script1.expected +++ b/tests/cachekey/project/elements/script1.expected @@ -1 +1 @@ -c034688a87a56c7bbfcb07768cdbe5972bb6bf7185bca6e0b68690e62d082221
\ No newline at end of file +40ab20bc2a25b43b4ccbc1207dd5a920f488698582ef4991e2c4dbb35fceae88
\ No newline at end of file diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected index 938b9a7e3..1d6a86284 100644 --- a/tests/cachekey/project/target.expected +++ b/tests/cachekey/project/target.expected @@ -1 +1 @@ -60e14915e6c84da7644178b21e76d7c272506ed1f5e6a5513229215a59c4a1a4
\ No newline at end of file +e9b628e01c22631d927a0a3b8d16d2903c4c1455263c7d09bed23535f3a38c43
\ No newline at end of file |