From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Date: Tue, 24 Mar 2020 14:34:05 +0000 (+0200)
Subject: gitlab-ci: Fix traces caching in tracie
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=05069e1f0794aadd40ce9269f858e50c64254388;hp=efdce97e4bb0a4b2e5d81d2f9276f3eedd9561b6;p=mesa.git

gitlab-ci: Fix traces caching in tracie

We are currently comparing a hex string representation of the git lfs
OID with a byte array representation of the locally calculated OID,
causing detection of valid cached traces to fail. Ensure we are
comparing compatible representations (in this case hex strings).

Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4300>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4300>
---

diff --git a/.gitlab-ci/tracie/tracie.py b/.gitlab-ci/tracie/tracie.py
index 445f566f200..388a73423bf 100644
--- a/.gitlab-ci/tracie/tracie.py
+++ b/.gitlab-ci/tracie/tracie.py
@@ -86,7 +86,7 @@ def checksum(filename, hash_factory=hashlib.sha256, chunk_num_blocks=128):
     with open(filename,'rb') as f:
         for chunk in iter(lambda: f.read(chunk_num_blocks*h.block_size), b''):
             h.update(chunk)
-    return h.digest()
+    return h.hexdigest()
 
 def ensure_trace(repo_url, repo_commit, trace):
     trace_path = TRACES_DB_PATH + trace['path']