Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.17](backport #39598) Restore macOS CI execution with merge commits #39599

Merged
merged 3 commits into from
May 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 16, 2024

Proposed commit message

This PR partially reverts #39533 and restores the execution of macOS CI with merge commits (main + release branches) since there is coverage via GH actions.

It also removes the GH actions to avoid duplicate checks.

Related issues

Superseeds https://github.com/elastic/beats/pull/39590/files#diff-a84a042c7233d8b28dbc76771a45f77d93de33f2a86596499f8812d1b85eb919


This is an automatic backport of pull request #39598 done by [Mergify](https://mergify.com).

This PR partially reverts #39533 and restores the execution of macOS CI
with merge commits (`main` + release branches) since there is coverage
via GH actions.

It also removes the GH actions to avoid duplicate checks.

(cherry picked from commit 2aef900)

# Conflicts:
#	.buildkite/auditbeat/auditbeat-pipeline.yml
#	.buildkite/filebeat/filebeat-pipeline.yml
#	.github/workflows/macos-auditbeat.yml
#	.github/workflows/macos-filebeat.yml
#	.github/workflows/macos-heartbeat.yml
#	.github/workflows/macos-metricbeat.yml
#	.github/workflows/macos-packetbeat.yml
#	.github/workflows/macos-xpack-auditbeat.yml
#	.github/workflows/macos-xpack-filebeat.yml
#	.github/workflows/macos-xpack-functionbeat.yml
#	.github/workflows/macos-xpack-heartbeat.yml
#	.github/workflows/macos-xpack-metricbeat.yml
#	.github/workflows/macos-xpack-osquerybeat.yml
#	.github/workflows/macos-xpack-packetbeat.yml
@mergify mergify bot requested a review from a team as a code owner May 16, 2024 14:44
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 16, 2024
Copy link
Contributor Author

mergify bot commented May 16, 2024

Cherry-pick of 2aef900 has failed:

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

You are currently cherry-picking commit 2aef900171.
  (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/heartbeat/heartbeat-pipeline.yml
	modified:   .buildkite/metricbeat/pipeline.yml
	modified:   .buildkite/packetbeat/pipeline.packetbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.auditbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.filebeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.heartbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.metricbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.packetbeat.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .buildkite/auditbeat/auditbeat-pipeline.yml
	both modified:   .buildkite/filebeat/filebeat-pipeline.yml
	deleted by them: .github/workflows/macos-auditbeat.yml
	deleted by them: .github/workflows/macos-filebeat.yml
	deleted by them: .github/workflows/macos-heartbeat.yml
	deleted by them: .github/workflows/macos-metricbeat.yml
	deleted by them: .github/workflows/macos-packetbeat.yml
	deleted by them: .github/workflows/macos-xpack-auditbeat.yml
	deleted by them: .github/workflows/macos-xpack-filebeat.yml
	deleted by them: .github/workflows/macos-xpack-functionbeat.yml
	deleted by them: .github/workflows/macos-xpack-heartbeat.yml
	deleted by them: .github/workflows/macos-xpack-metricbeat.yml
	deleted by them: .github/workflows/macos-xpack-osquerybeat.yml
	deleted by them: .github/workflows/macos-xpack-packetbeat.yml

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 16, 2024
@dliappis dliappis added macOS Enable builds in the CI for darwin testing Team:Ingest-EngProd and removed conflicts There is a conflict in the backported pull request labels May 16, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 16, 2024
@dliappis
Copy link
Contributor

/test

@dliappis dliappis requested a review from a team as a code owner May 16, 2024 15:01
@dliappis dliappis requested review from AndersonQ, leehinman and alexsapran and removed request for a team, AndersonQ and leehinman May 16, 2024 15:01
@dliappis dliappis merged commit 0304ab6 into 7.17 May 17, 2024
93 checks passed
@dliappis dliappis deleted the mergify/bp/7.17/pr-39598 branch May 17, 2024 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport macOS Enable builds in the CI for darwin testing Team:Ingest-EngProd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants