From 4ddfdc2ae0a9930c70af2d174be5c0d7c6912f3d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 3 Jun 2023 17:00:52 +0300
Subject: feat(nix/buildkite): extraSteps: include parentLabel into hash

Contrary to the normal steps, extra steps only show the attribute name
in their label, not the whole attribute path.

To make sure these are still unique, also incorporate the parentLabel
into the string that's hashed.

Change-Id: Ic7a1f76aaac159ab5bd30054e422234882947990
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8708
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
---
 nix/buildkite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nix')

diff --git a/nix/buildkite/default.nix b/nix/buildkite/default.nix
index 5b9aa222ac4a..4849d1b8ea54 100644
--- a/nix/buildkite/default.nix
+++ b/nix/buildkite/default.nix
@@ -405,7 +405,7 @@ rec {
   mkExtraStep = buildEnabled: cfg:
     let
       step = {
-        key = hashString "sha1" cfg.label;
+        key = hashString "sha1" "${cfg.label}-${cfg.parentLabel}";
         label = ":gear: ${cfg.label} (from ${cfg.parentLabel})";
         skip =
           let
-- 
cgit 1.4.1