From patchwork Wed Dec 18 12:45:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 22396 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C8C0EC3301 for ; Wed, 18 Dec 2024 12:46:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B3E9468094; Wed, 18 Dec 2024 13:46:00 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="wNzc7E6K"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DCCF867F59 for ; Wed, 18 Dec 2024 13:45:58 +0100 (CET) Received: from pb-laptop.local (185.221.140.157.nat.pool.zt.hu [185.221.140.157]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C994459D for ; Wed, 18 Dec 2024 13:45:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1734525920; bh=aAWHrlINUYgTqcvEEUTDrZxSOEA1vey9IkoOUQG2OOA=; h=From:To:Subject:Date:From; b=wNzc7E6K1y/8ZWAvT92PRHCWuTY4FZH+ND/0VfnPOfuZp6VM6x2ig/uD9lgvs1Czy 3BfmRD91s9+fnIHHIKUm85/8/uOfwVZti8WmfNDvdyPPPi/YhtevJyhkatFWB4sZ1U utXhbbO/eCJm1AvLDfqZS1UIv6pdIURRjBh0KP0k= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH v1] Eliminate duplicate keys in YAML Date: Wed, 18 Dec 2024 13:45:55 +0100 Message-ID: <20241218124555.330740-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The key `artifacts` occurs twice in the `test-unit` dictionary. Gitlab accepts this, but as if only the second occurrence was present, so the meson logs are not saved as artifacts. Merge the two artifact specifications to fix this. Fixes: 075d5a5cd22ecd ("Enable junit artifact generation for test-unit job") Signed-off-by: Barnabás Pőcze Reviewed-by: Laurent Pinchart --- gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.47.1 diff --git a/gitlab-ci.yml b/gitlab-ci.yml index ec19f55..48c18d5 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -394,6 +394,8 @@ test-unit: expire_in: 1 week paths: - build/meson-logs/ + reports: + junit: build/meson-logs/testlog.junit.xml variables: BUILD_TYPE: debug MESON_OPTIONS: >- @@ -408,9 +410,6 @@ test-unit: -D qcam=disabled -D test=true -D v4l2=true - artifacts: - reports: - junit: build/meson-logs/testlog.junit.xml test-lc-compliance:virtual: extends: