Module: Mesa
Branch: master
Commit: 05069e1f0794aadd40ce9269f858e50c64254388
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=05069e1f0794aadd40ce9269f858e50c64254388

Author: Alexandros Frantzis <[email protected]>
Date:   Tue Mar 24 16:34:05 2020 +0200

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 <[email protected]>
Reviewed-by: Tomeu Vizoso <[email protected]>
Tested-by: Marge Bot 
<https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4300>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4300>

---

 .gitlab-ci/tracie/tracie.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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']

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to