From acfe24945f7790d8228a4f4fe1ee3aeb713a58ab Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Wed, 11 Apr 2018 22:13:42 +0900 Subject: buildstream/_versions.py: Increment BST_CORE_ARTIFACT_VERSION Now that we've restructured the artifact metadata into separate files, we need to rev the artifact version. --- buildstream/_versions.py | 2 +- tests/cachekey/project/elements/build1.expected | 2 +- tests/cachekey/project/elements/build2.expected | 2 +- tests/cachekey/project/elements/compose1.expected | 2 +- tests/cachekey/project/elements/compose2.expected | 2 +- tests/cachekey/project/elements/compose3.expected | 2 +- tests/cachekey/project/elements/compose4.expected | 2 +- tests/cachekey/project/elements/compose5.expected | 2 +- tests/cachekey/project/elements/import1.expected | 2 +- tests/cachekey/project/elements/import2.expected | 2 +- tests/cachekey/project/elements/import3.expected | 2 +- tests/cachekey/project/elements/script1.expected | 2 +- tests/cachekey/project/sources/bzr1.expected | 2 +- tests/cachekey/project/sources/git1.expected | 2 +- tests/cachekey/project/sources/git2.expected | 2 +- tests/cachekey/project/sources/local1.expected | 2 +- tests/cachekey/project/sources/local2.expected | 2 +- tests/cachekey/project/sources/ostree1.expected | 2 +- tests/cachekey/project/sources/patch1.expected | 2 +- tests/cachekey/project/sources/patch2.expected | 2 +- tests/cachekey/project/sources/patch3.expected | 2 +- tests/cachekey/project/sources/tar1.expected | 2 +- tests/cachekey/project/sources/tar2.expected | 2 +- tests/cachekey/project/sources/zip1.expected | 2 +- tests/cachekey/project/sources/zip2.expected | 2 +- tests/cachekey/project/target.expected | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/buildstream/_versions.py b/buildstream/_versions.py index cda516ace..f2a08b14b 100644 --- a/buildstream/_versions.py +++ b/buildstream/_versions.py @@ -34,4 +34,4 @@ BST_FORMAT_VERSION = 6 # or if buildstream was changed in a way which can cause # the same cache key to produce something that is no longer # the same. -BST_CORE_ARTIFACT_VERSION = 1 +BST_CORE_ARTIFACT_VERSION = 2 diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected index 6e228fd8f..ab8adf225 100644 --- a/tests/cachekey/project/elements/build1.expected +++ b/tests/cachekey/project/elements/build1.expected @@ -1 +1 @@ -9ce7551d85308d10ce783799338cf5d42750ef364842fabbbcd8e77c13db64c3 \ No newline at end of file +93594f53df6c599598ea9c1d5101a8f7e57bbd82cac521494ce680e6f84de67d \ No newline at end of file diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected index 115abc9a5..94990176a 100644 --- a/tests/cachekey/project/elements/build2.expected +++ b/tests/cachekey/project/elements/build2.expected @@ -1 +1 @@ -02cd3ad590b76efa6b4d0b608561163a66dee1bf8c359117419d251d646642d9 \ No newline at end of file +3ae596efed1126d440780ef33d2144a06cb7215a778c4f59b12a2f77fa0ee3b2 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected index 458fb55a7..e912fbe62 100644 --- a/tests/cachekey/project/elements/compose1.expected +++ b/tests/cachekey/project/elements/compose1.expected @@ -1 +1 @@ -6264380c3bb8c456d0159863118b071e903a8545a1922d226ed6dd688e20a109 \ No newline at end of file +d67fccd867504706010f9f36b07cd35b3129e9d79ae287c3dc2bf9ec03e309ea \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected index 7b48672f7..4c3b901b1 100644 --- a/tests/cachekey/project/elements/compose2.expected +++ b/tests/cachekey/project/elements/compose2.expected @@ -1 +1 @@ -5105c6f0b08ebb6c3cbe1d18eef30439327a1363a230a5f1aa6c814876cfa4a5 \ No newline at end of file +743eaac4f261d389d2c12fb9c8605eb70d5e42c8a0bccadef9f651dd137cedde \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected index ed22cec42..85843a190 100644 --- a/tests/cachekey/project/elements/compose3.expected +++ b/tests/cachekey/project/elements/compose3.expected @@ -1 +1 @@ -f8d654b1975456b5a2619ce492abbfb740611591a8fe359a8ff65c6937e72636 \ No newline at end of file +5b401864d1d91809f59c258d37f78b410b244fcb20cab4bd0c1da17257515643 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected index 478f17a0b..38060ae5a 100644 --- a/tests/cachekey/project/elements/compose4.expected +++ b/tests/cachekey/project/elements/compose4.expected @@ -1 +1 @@ -687bf6d47c536d690276a6a43377df4c012a07a1557580007bcd5bbe9782127c \ No newline at end of file +450664eb37302835e3289b95dfb38cab0b24e6c30c4b7b59a5dc1b5a7f1f01e0 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected index b7724e783..2f6307ca9 100644 --- a/tests/cachekey/project/elements/compose5.expected +++ b/tests/cachekey/project/elements/compose5.expected @@ -1 +1 @@ -4d514e78ad5335a030f4154be773872f70d4bb3c961c3844fd0d2e16d268e025 \ No newline at end of file +fedaf8a315f8a9fb94d11c6f74a409188ff9397eac710e5ba6d9532162bd6973 \ No newline at end of file diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected index 1d9bb71c3..4669ed485 100644 --- a/tests/cachekey/project/elements/import1.expected +++ b/tests/cachekey/project/elements/import1.expected @@ -1 +1 @@ -4ad3f24fb7283738ce23ee22b26559ea11f995a56a0f07d66d7bab3f61f4179e \ No newline at end of file +20582fab199a8d110fd65b5616f45bc08ae3eccc7bfe8b94ba987f3986b69ce5 \ No newline at end of file diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected index 981dba524..2b071ac53 100644 --- a/tests/cachekey/project/elements/import2.expected +++ b/tests/cachekey/project/elements/import2.expected @@ -1 +1 @@ -751adb6596c139acc14d6e48bea03b6a73ebd08ad8c897546b667f5d3b1c20b5 \ No newline at end of file +4fcc04697288b0fdc0785b7350c308c3b40177d2ad0ec47ee4e59afbbe7634a9 \ No newline at end of file diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected index 525bad4ee..538daae37 100644 --- a/tests/cachekey/project/elements/import3.expected +++ b/tests/cachekey/project/elements/import3.expected @@ -1 +1 @@ -47dbf0fb291273606bee23afa90bd61d60199b438faf409035d7c5f54cdf5134 \ No newline at end of file +203a3749724d461a237f22ff261870616cedfe34bfb59603c935fd05644059b3 \ No newline at end of file diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected index b7473875d..cf1213901 100644 --- a/tests/cachekey/project/elements/script1.expected +++ b/tests/cachekey/project/elements/script1.expected @@ -1 +1 @@ -e0dfac539f12753f68bcbef67669f1dd66debe449ebc0120fa224a18c5ed45fb \ No newline at end of file +93de2701d76db777a560e1e531883b7922b07683d4e7c14ea26b0500946f2c62 \ No newline at end of file diff --git a/tests/cachekey/project/sources/bzr1.expected b/tests/cachekey/project/sources/bzr1.expected index 8ad869d37..0e2a851e5 100644 --- a/tests/cachekey/project/sources/bzr1.expected +++ b/tests/cachekey/project/sources/bzr1.expected @@ -1 +1 @@ -7698ed38772af50009cce4cade09eb2a023475d306a3ad651d5ad81b5f146f5f \ No newline at end of file +8509b1e54cc11bc2681425a11498037ad3841295c26fec86ff61a6b09d83e10a \ No newline at end of file diff --git a/tests/cachekey/project/sources/git1.expected b/tests/cachekey/project/sources/git1.expected index fe7be55c0..07fc21cfd 100644 --- a/tests/cachekey/project/sources/git1.expected +++ b/tests/cachekey/project/sources/git1.expected @@ -1 +1 @@ -9fda8c5236b49c0a886270d2f5f9c9821a17702e08fb4ee031dccf528ce93295 \ No newline at end of file +c1931acaea82971f1fc243dbe035a228c6103d52e09e618c7eda85f141c726cc \ No newline at end of file diff --git a/tests/cachekey/project/sources/git2.expected b/tests/cachekey/project/sources/git2.expected index dc719eed7..b08e08cf7 100644 --- a/tests/cachekey/project/sources/git2.expected +++ b/tests/cachekey/project/sources/git2.expected @@ -1 +1 @@ -0845128c2d465362075129a0ffd45bae2789fe6cee273293aa2f9dddc8ecc948 \ No newline at end of file +6d1ee891d29e0af504ed59ccd46c653b74946d3778d7e941f4d8b6e68cf3ca50 \ No newline at end of file diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected index 1d9bb71c3..4669ed485 100644 --- a/tests/cachekey/project/sources/local1.expected +++ b/tests/cachekey/project/sources/local1.expected @@ -1 +1 @@ -4ad3f24fb7283738ce23ee22b26559ea11f995a56a0f07d66d7bab3f61f4179e \ No newline at end of file +20582fab199a8d110fd65b5616f45bc08ae3eccc7bfe8b94ba987f3986b69ce5 \ No newline at end of file diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected index aeda5dac0..4a0796ec2 100644 --- a/tests/cachekey/project/sources/local2.expected +++ b/tests/cachekey/project/sources/local2.expected @@ -1 +1 @@ -a768571d58fedb28f70ca59b98a298b5a95c08f5909d57e0717ca13df15edf29 \ No newline at end of file +527685945072d971075edf6e4a06ce7146ef1cd023da0001c6e1613d525c76aa \ No newline at end of file diff --git a/tests/cachekey/project/sources/ostree1.expected b/tests/cachekey/project/sources/ostree1.expected index 01f50cb89..5b4bf12e9 100644 --- a/tests/cachekey/project/sources/ostree1.expected +++ b/tests/cachekey/project/sources/ostree1.expected @@ -1 +1 @@ -ba89a536096b5cac0f4ad09770189132eea929531d5716ea5b400f314f3e2552 \ No newline at end of file +b78e79c5ba297cf5cb41d6eaa5f4ca170216c967b84935364d30938021202341 \ No newline at end of file diff --git a/tests/cachekey/project/sources/patch1.expected b/tests/cachekey/project/sources/patch1.expected index be110f9c5..a04b8fd40 100644 --- a/tests/cachekey/project/sources/patch1.expected +++ b/tests/cachekey/project/sources/patch1.expected @@ -1 +1 @@ -223677ae43c0980dbb2958ccb78b289e9154eaa57daea99558bea80cbbcdde30 \ No newline at end of file +84830ad8577e5fa5a9dab14ce3f995b4dc16699aebc33122aa2dc5fade34528d \ No newline at end of file diff --git a/tests/cachekey/project/sources/patch2.expected b/tests/cachekey/project/sources/patch2.expected index ff7a10397..3fafb87b8 100644 --- a/tests/cachekey/project/sources/patch2.expected +++ b/tests/cachekey/project/sources/patch2.expected @@ -1 +1 @@ -f1cf814806f9a8828754f24a4b31e8fdc2ea5533ce808d9a20b1986641f0a53b \ No newline at end of file +1d137c65e7f2f9c8a0a74a46461dfe9ba5c675d53a1ff96a4bf15f0889891883 \ No newline at end of file diff --git a/tests/cachekey/project/sources/patch3.expected b/tests/cachekey/project/sources/patch3.expected index 209f9c231..6a62b7049 100644 --- a/tests/cachekey/project/sources/patch3.expected +++ b/tests/cachekey/project/sources/patch3.expected @@ -1 +1 @@ -8d28355abf2d2abbc5626eea4b0fa3955bb8dc7dab50cb2c6a446fd333eacfb7 \ No newline at end of file +fd1f209c8f44fd629fb5201d6f299c47567b64828235b470b2ff8ff6edba4478 \ No newline at end of file diff --git a/tests/cachekey/project/sources/tar1.expected b/tests/cachekey/project/sources/tar1.expected index 5723abaa7..5b52a4c00 100644 --- a/tests/cachekey/project/sources/tar1.expected +++ b/tests/cachekey/project/sources/tar1.expected @@ -1 +1 @@ -709d8a389869aed817521c470a70afe41e9ce3aa287c7c6db9f4728b5cbeee1e \ No newline at end of file +003d5c53c81ab4bf7e375c4e9704bdbc260473fecb334c9f78ed24ec5c1a908e \ No newline at end of file diff --git a/tests/cachekey/project/sources/tar2.expected b/tests/cachekey/project/sources/tar2.expected index 4460f9fc9..d823bdee0 100644 --- a/tests/cachekey/project/sources/tar2.expected +++ b/tests/cachekey/project/sources/tar2.expected @@ -1 +1 @@ -8dda4496e14f20236d45b6a5f2a11648329621f313ce6e821ae1ca1f8af88d6c \ No newline at end of file +f501ed7c8df19071712634049fed1a1fb22fbeb6f27973595bc8139e56c6c446 \ No newline at end of file diff --git a/tests/cachekey/project/sources/zip1.expected b/tests/cachekey/project/sources/zip1.expected index 73f2dfae3..64c0655b4 100644 --- a/tests/cachekey/project/sources/zip1.expected +++ b/tests/cachekey/project/sources/zip1.expected @@ -1 +1 @@ -b58c2a51ff1593c9f73f8838b8d90e7fcdb5487c704a095e7715a22d8f97cfd3 \ No newline at end of file +6a3c3a788c6a6ddae204a013d0622b6c352a91ff31cdf6d652b96ad0ac5eda52 \ No newline at end of file diff --git a/tests/cachekey/project/sources/zip2.expected b/tests/cachekey/project/sources/zip2.expected index ffb13498f..64bb77289 100644 --- a/tests/cachekey/project/sources/zip2.expected +++ b/tests/cachekey/project/sources/zip2.expected @@ -1 +1 @@ -f72d89fc47e5d3c949a68b1ceef57e2fd10a6e0f41630ef2b321107870892168 \ No newline at end of file +50a555bf892822b8f5e4d59b940ba4359afe8e6d01dff013d918a3befd9c3d8f \ No newline at end of file diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected index 784e3f2a0..dcb6a6642 100644 --- a/tests/cachekey/project/target.expected +++ b/tests/cachekey/project/target.expected @@ -1 +1 @@ -f2a5127dc0539eb54b57d405ba64d97d5c951a561a8386619624b1e36f65a059 \ No newline at end of file +0de68ec99d39b12857a5350ebfdc7f49fdde9a3457a31b2330896307fb503f7b \ No newline at end of file -- cgit v1.2.1