OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: fix trace update script

Browse Source 
this was broken by various things

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31070>
This commit is contained in:
Mike Blumenkrantz
2024-09-06 14:43:42 -04:00
committed by Marge Bot
parent e509139f61
commit f944c18fad
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/ci/update_traces_checksum.py
View File

@@ -23,7 +23,7 @@ from colorama import Fore, Style
from gitlab_common import get_gitlab_project, read_token, wait_for_pipeline from gitlab_common import get_gitlab_project, read_token, wait_for_pipeline
DESCRIPTION_FILE = "export PIGLIT_REPLAY_DESCRIPTION_FILE='.*/install/(.*)'$" DESCRIPTION_FILE = "export PIGLIT_REPLAY_DESCRIPTION_FILE=.*/install/(.*)$"
DEVICE_NAME = "export PIGLIT_REPLAY_DEVICE_NAME='(.*)'$" DEVICE_NAME = "export PIGLIT_REPLAY_DEVICE_NAME='(.*)'$"
@@ -40,7 +40,7 @@ def gather_results(
cur_job = project.jobs.get(job.id) cur_job = project.jobs.get(job.id)
# get variables # get variables
print(f"👁 {job.name}...") print(f"👁 {job.name}...")
log: list[str] = cur_job.trace().decode("unicode_escape").splitlines() log: list[str] = cur_job.trace().decode("unicode_escape", "ignore").splitlines()
filename: str = '' filename: str = ''
dev_name: str = '' dev_name: str = ''
for logline in log: for logline in log:
@@ -69,7 +69,7 @@ def gather_results(
target = yaml.load(target_file) target = yaml.load(target_file)
# parse artifact # parse artifact
results_json_bz2 = cur_job.artifacts.raw(artifact_path="results/results.json.bz2") results_json_bz2 = cur_job.artifact("results/results.json.bz2")
results_json = bz2.decompress(results_json_bz2).decode("utf-8", errors="replace") results_json = bz2.decompress(results_json_bz2).decode("utf-8", errors="replace")
results = json.loads(results_json) results = json.loads(results_json)