Closed mergify[bot] closed 1 month ago
Cherry-pick of cc0bda76881551540d8434b1b9e5441cc039935e has failed:
On branch mergify/bp/7.17/pr-40238
Your branch is up to date with 'origin/7.17'.
You are currently cherry-picking commit cc0bda7688.
(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)
Changes to be committed:
modified: .buildkite/metricbeat/pipeline.yml
deleted: .buildkite/scripts/changesets.psm1
new file: dev-tools/mage/module_changeset.go
modified: metricbeat/magefile.go
modified: x-pack/metricbeat/magefile.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: .buildkite/heartbeat/heartbeat-pipeline.yml
both modified: .buildkite/x-pack/pipeline.xpack.auditbeat.yml
both modified: .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
both modified: .buildkite/x-pack/pipeline.xpack.metricbeat.yml
both modified: .buildkite/x-pack/pipeline.xpack.winlogbeat.yml
both modified: x-pack/auditbeat/magefile.go
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
This pull request has not been merged yet. Could you please review and merge it @oakrizan? 🙏
PTAL @alexsapran @belimawr @nfritts
This pull request has not been merged yet. Could you please review and merge it @oakrizan? 🙏
This pull request has not been merged yet. Could you please review and merge it @oakrizan? 🙏
Proposed commit message
Added MODULE env var definition within mage. MODULE is set within invoking mage target, if there are changes brought by the PR, instead of calling separate bash-script to evaluate changes and define variable.
Checklist
CHANGELOG.next.asciidoc
orCHANGELOG-developer.next.asciidoc
.Related issues
Logs
BK builds:
This is an automatic backport of pull request #40238 done by Mergify.