From 4316e0459e4b35a90968aeabc5c0e14e66f66fcd Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohan.garg@collabora.com>
Date: Tue, 9 Feb 2021 17:43:35 +0100
Subject: [PATCH] ci: Ensure that jobs inherting the ci-deqp jobs artifact
 meson logs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since gitlab-ci cannot merge artifact lists, and the last entry a job
extends from overwrites the artifact list, we should ensure that we
artifact meson logs via the .ci-deqp-artifacts job.

Signed-off-by: Rohan Garg <rohan.garg@collabora.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8937>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7d841383f4..fb28c559b2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -188,6 +188,7 @@ success:
       # Watch out!  Artifacts are relative to the build dir.
       # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521
       - artifacts
+      - _build/meson-logs/*.txt
 
 
 # Docker image tag helper templates