From 61905a7f04ab7801e6fb625ea302544b14d2c711 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Tue, 13 Jun 2023 22:40:21 +0200 Subject: [PATCH] ci: add perfetto into mesa git-cache Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8821 Fixes: 8aff2281276c ("ci: Enable building the testing drivers with perfetto.") Signed-off-by: David Heidelberg Part-of: (cherry picked from commit c4357c6c498010677eff37a7730bdab2cbd7ff1d) --- .gitlab-ci.yml | 2 ++ .pick_status.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a72fc18393..5cefa1a09a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,6 +214,8 @@ make git archive: script: # Compactify the .git directory - git gc --aggressive + # Download & cache the perfetto subproject as well. + - rm -rf subprojects/perfetto ; mkdir -p subprojects/perfetto && curl https://android.googlesource.com/platform/external/perfetto/+archive/$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3).tar.gz | tar zxf - -C subprojects/perfetto # compress the current folder - tar -cvzf ../$CI_PROJECT_NAME.tar.gz . diff --git a/.pick_status.json b/.pick_status.json index 71ee2a8dd80..567448d720d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1156,7 +1156,7 @@ "description": "ci: add perfetto into mesa git-cache", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "8aff2281276c27c929c54ac4b98d564a92718cd8" },