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

Commits on May 16, 2024

  1. Restore macOS CI execution with merge commits (#39598)

    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
    dliappis authored and mergify[bot] committed May 16, 2024
    Configuration menu
    Copy the full SHA
    91dd313 View commit details
    Browse the repository at this point in the history
  2. fix conflicts

    dliappis committed May 16, 2024
    Configuration menu
    Copy the full SHA
    ffd1d32 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    12ca34c View commit details
    Browse the repository at this point in the history