From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 844A821B9CD for ; Thu, 15 May 2025 08:06:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747296409; cv=none; b=WC0HTmtV8/eXg+wmVCF8//TbqRDey7kl5EqdoxCAlVUlvcg6qsp8S9eQ+He0hjQTBgJxDfIrc/CjN2MTUVIH8nzj1IpcK6xJVud+6TT/d2XdCtOLXtzCu1mf7hKVjsxMWV0LAh9cNYbaW59VwvY52C1G6CAiiuoNwx/iCiKEI0E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747296409; c=relaxed/simple; bh=+SDCVDepUbrSpMK/Ip7B0j1Kb17Xh9xQWz0qqhBgzLc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=T5yQWnsZBo0jC8cikaU1l16OZ6X1b6May+LsFxUbiIVvMRN1EEp/PudoOS1nJq42gGq0xIN2z6rPsG8rmX1V/GjkhDrjw5nskwr6qNOEPjdrotn8rK9g58bXzJQvI4+FsEPniCidH5TEiz5KHsJVqpf90lxEOQ3pgVpLVozeZtI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Vj9VmT8H; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Vj9VmT8H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39897C4CEE9; Thu, 15 May 2025 08:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747296409; bh=+SDCVDepUbrSpMK/Ip7B0j1Kb17Xh9xQWz0qqhBgzLc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Vj9VmT8HhnjVtC9FgMZPgT1IxGJjb62O0VX9wxV4aPnKqf72PXFj76dG7uFCt7/kv +EDYsddi3dbYN+hWEygTrve/P0kuYZP2kh5x5Qd+De9z+CAd0Fnd4SD6zWg1T1R1o0 POX+2Y1t2I4zAX/NjgLi6+f4ldDuBAX2OPcSKtNEzwszUadJNOcM5SXQiMTVOa0X77 jCPjHlAUx0yqz+nsUMfVKVylAlEXL+m2n0zWM4ZSYV8FGkJRD3QATOEom7dVUjS8Qc TL/fTcZDIi5ggJ3Wugsb0Z+rqu5WtJ6jaHOyl7jX3uw9uMoaBu0WonUSbkrBNn0swp eUmIIsq0Cn5FQ== From: Daniel Gomez Date: Thu, 15 May 2025 10:06:19 +0200 Subject: [PATCH 1/2] generate_refs: fix gitref duplicated refs Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250515-gitref-fixes-v1-1-cbd37288d5b9@samsung.com> References: <20250515-gitref-fixes-v1-0-cbd37288d5b9@samsung.com> In-Reply-To: <20250515-gitref-fixes-v1-0-cbd37288d5b9@samsung.com> To: Luis Chamberlain Cc: kdevops@lists.linux.dev, Daniel Gomez , Daniel Gomez X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1980; i=da.gomez@samsung.com; h=from:subject:message-id; bh=Ff3WrwUTj5hJBd1tf5TbNLn12AhFxv3GOjrDD4nzVUc=; b=owEBbQKS/ZANAwAIAYX1bqTp6BOPAcsmYgBoJaCU34hIQW3Uq3uBieKTkIoYLt5xrlYSgcMT5 fbhenhwfkeJAjMEAAEIAB0WIQSyp6nP3QO1QP9YsnGF9W6k6egTjwUCaCWglAAKCRCF9W6k6egT jwhQEACD0z9gVJcYy7L+nJl/B4FZI4Ng6WcEUUJPq3ba2KGnT75iG8E32lJM0mcDiBPnLq3JHYC 6E7QkfVFGySFHZQqxfut5XOrihJAAYcKsSkcbdqXXNurjY3hrkgiiMCts4S2zyP1H1GCbjem3NF jkgtlc9gDzdaGMl1aJkbhH1cVbWs8ZDnaWKrYCC6MzGfWLD851BZyok/NMrBgb/0qEAFf/UfzXy HeWCnoTZURxKgu5hMNzoIiuf0pfY0yudsh2HT/DlngYEkp5N4s0/yrQmPdzLRo41tMlO9kQswil Z1KJI6y1mLm51jG5kRAO75ZzPXnklHn46V0DIiiIIFxPty3RDJ3ElmmEHnSYQWG1hMvDd/uvtWX oodTPfhAR4m1ds28hH8sFlQa/jBlhmnLmBr0ClKWEKq22aL3Z3BySoE8HwHF4+95vfmDqOhHkVj uPZ5T1y49sWFQeoBIdCZZzpdGV6UXTsHjNuO/uHshPjt7WjbqBZ9THIAusBQkqvw40uRdKg/os5 tkKT7SaZPaaDgUJzYt/j/mird56iFJWcyql0ywS2Csym8p0L7XOi3CHzhiWnoDmZBKwHmnduANp sNnlZ6SpVBQL/wUvEHljQJa2lZTNZo5MJ91wLISUBfNznSEZzxoFuTkdL/+tmz5hEJy1XLSCFAi yxYqGyckZmLBKIA== X-Developer-Key: i=da.gomez@samsung.com; a=openpgp; fpr=B2A7A9CFDD03B540FF58B27185F56EA4E9E8138F From: Daniel Gomez Static references in YAML where not in consideration when using gitref for the final ref generated file. Read them first and exclude any git reference found that is already in the static list. Signed-off-by: Daniel Gomez --- scripts/generate_refs.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/generate_refs.py b/scripts/generate_refs.py index cea4f7251226947f2983c31a4d26cc9d65eb7fac..e7032000bbac24ac872b83c7d962c8ee097064b2 100755 --- a/scripts/generate_refs.py +++ b/scripts/generate_refs.py @@ -257,7 +257,7 @@ def remote(args) -> List: return [heads["stdout"], tags["stdout"]] -def gitref_getreflist(args, reflist): +def gitref_getreflist(args, reflist, extraconfs): refs = [] for refline in reflist.splitlines(): if "^{}" in refline: @@ -265,6 +265,8 @@ def gitref_getreflist(args, reflist): if len(refs) >= args.refs: break ref_name = refline.split("/")[-1] + if any(config["ref"] == ref_name for config in extraconfs): + continue refs.append(ref_name) logging.debug("release: {}".format(ref_name)) return refs @@ -296,14 +298,15 @@ def gitref(args) -> None: # Only generate git reference if we have connection. Otherwise the output # file would contain static reference only and they should be already # part of the kreleases generation. + extraconfs = _get_extraconfs(args) if _check_connection("git.kernel.org", 80): reflist = [] refstr = remote(args) for rl in refstr: - _refs = gitref_getreflist(args, rl) + _refs = gitref_getreflist(args, rl, extraconfs) for r in _refs: reflist.append(r) - ref_generator(args, reflist, _get_extraconfs(args)) + ref_generator(args, reflist, extraconfs) def kreleases(args) -> None: -- 2.49.0