[8.13](backport #39598) Restore macOS CI execution with merge commits #39600
+14
−14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
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: # .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
bot
added
backport
conflicts
|
Cherry-pick of 2aef900 has failed: 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
bot
added
the
needs_team
|
This pull request doesn't have a |
|
Closing and raising a new manually raised PR as mergify shows conflicts that are hard to find. |
|
superseded by #39603 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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).