Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 10, 2025

What does this PR do?

Fix a pre-command hook to allow BUILDKITE_PIPELINE_SLUG to match elastic-agent for PRs, and elastic-agent-extended-tests once it has merged to main


This is an automatic backport of pull request #8418 done by Mergify.

(cherry picked from commit 97246c1)

# Conflicts:
#	.buildkite/hooks/pre-command
@mergify mergify bot requested a review from a team as a code owner June 10, 2025 12:17
@mergify mergify bot added the backport label Jun 10, 2025
@mergify mergify bot requested a review from a team as a code owner June 10, 2025 12:17
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 10, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 10, 2025

Cherry-pick of 97246c1 has failed:

On branch mergify/bp/8.19/pr-8418
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 97246c150.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/hooks/pre-command

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@elasticmachine
Copy link
Collaborator

@michel-laterman
Copy link
Contributor

We're going to include this backport as part of #8415 so we don't break the 8.19 branch

@mergify mergify bot deleted the mergify/bp/8.19/pr-8418 branch June 10, 2025 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport ci conflicts There is a conflict in the backported pull request skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants