Skip to content

Restore macOS CI execution with merge commits#39598

Merged
dliappis merged 1 commit intoelastic:mainfrom
dliappis:execute-macos-on-merge-commits
May 16, 2024
Merged

Restore macOS CI execution with merge commits#39598
dliappis merged 1 commit intoelastic:mainfrom
dliappis:execute-macos-on-merge-commits

Conversation

@dliappis
Copy link
Copy Markdown
Contributor

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 PR partially reverts elastic#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.
@dliappis dliappis requested review from alexsapran and v1v May 16, 2024 13:04
@dliappis dliappis self-assigned this May 16, 2024
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels May 16, 2024
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented May 16, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @dliappis? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@dliappis dliappis added the macOS Enable builds in the CI for darwin testing label May 16, 2024
@dliappis
Copy link
Copy Markdown
Contributor Author

/test

@dliappis dliappis added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify labels May 16, 2024
@dliappis dliappis marked this pull request as ready for review May 16, 2024 14:33
@dliappis dliappis requested a review from a team as a code owner May 16, 2024 14:33
@dliappis dliappis merged commit 2aef900 into elastic:main May 16, 2024
mergify bot pushed a commit that referenced this pull request May 16, 2024
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 bot pushed a commit that referenced this pull request May 16, 2024
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)
mergify bot pushed a commit that referenced this pull request May 16, 2024
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
dliappis added a commit to dliappis/beats that referenced this pull request May 16, 2024
This PR partially reverts elastic#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.
dliappis added a commit to dliappis/beats that referenced this pull request May 16, 2024
This PR partially reverts elastic#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.
@dliappis
Copy link
Copy Markdown
Contributor Author

Backport for 8.13 was manually created in #39603

dliappis added a commit that referenced this pull request May 16, 2024
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)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request May 17, 2024
…#39599)

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)

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request May 17, 2024
…#39603)

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)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify ci 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.

3 participants