From ebdcb4db196eb75234ca3686e4436e78f381b5cd Mon Sep 17 00:00:00 2001
From: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Date: Wed, 17 Apr 2024 18:02:59 +0300
Subject: [PATCH] fix trigger

---
 .buildkite/pipeline.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e2ed71136134..72ff9f846e2a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -286,15 +286,17 @@ steps:
                     - BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
                     - GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
 
-  - label: "Trigger x-pack/Heartbeat"
+  - label: "Trigger x-pack/heartbeat"
     plugins:
       - monorepo-diff#v1.0.1:
-          diff: "git diff --name-only HEAD~1"
+          diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
           watch:
             - path:
                 - x-pack/heartbeat/
                 - .buildkite/x-pack/pipeline.xpack.heartbeat.yml
-                #XPACK
+                - .buildkite/scripts/
+                - .buildkite/hooks/
+                # x-pack
                 - go.mod
                 - pytest.ini
                 - dev-tools/
@@ -303,10 +305,10 @@ steps:
                 - x-pack/libbeat/
               config:
                 trigger: "beats-xpack-heartbeat"
-                label: ":package: x-pack/heartbeat pipeline"
                 build:
                   commit: "${BUILDKITE_COMMIT}"
                   branch: "${BUILDKITE_BRANCH}"
                   env:
                     - BUILDKITE_PULL_REQUEST=${BUILDKITE_PULL_REQUEST}
+                    - BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
                     - GITHUB_PR_LABELS=${GITHUB_PR_LABELS}