Skip to content

Commit

Permalink
Restore macOS CI execution with merge commits (#39598)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dliappis authored and mergify[bot] committed May 16, 2024
1 parent f0a0338 commit 1696517
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .buildkite/auditbeat/auditbeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ steps:
context: "auditbeat: Linux arm64 Unit Tests"

- label: ":mac: Auditbeat macOS x86_64 Unit Tests"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
Expand All @@ -214,7 +214,7 @@ steps:
context: "auditbeat: macOS x86_64 Unit Tests"

- label: ":mac: Auditbeat macOS arm64 ARM Unit Tests"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/filebeat/filebeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ steps:
steps:
- label: ":mac: Filebeat macOS x86_64 Unit Tests"
key: "macos-unit-tests-extended"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
Expand All @@ -154,7 +154,7 @@ steps:

- label: ":mac: Filebeat macOS arm64 Unit Tests"
key: "macos-arm64-unit-tests-extended"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/heartbeat/heartbeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ steps:

- group: "Heartbeat Extended Testing MacOS"
key: "heartbeat-extended-tests-macos"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
steps:
- label: ":mac: Heartbeat MacOS Unit Tests"
key: "macos-extended"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/metricbeat/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ steps:

- group: "Metricbeat Extended MacOS Tests"
key: "metricbeat-extended-macos-tests"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
steps:
- label: ":mac: MacOS x64_64 Unit Tests"
key: "extended-macos-x64-64-unit-tests"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/packetbeat/pipeline.packetbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ steps:
steps:
- label: ":mac: MacOS x86_64 Unit Tests"
key: "macos-x86-64-unit-tests-extended"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/x-pack/pipeline.xpack.auditbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ steps:

- group: "x-pack/auditbeat MacOS Extended Tests"
key: "x-pack-auditbeat-extended-tests-macos"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
steps:
- label: ":mac: MacOS x86_64 Unit Tests"
command: |
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.filebeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ steps:
key: "x-pack-filebeat-extended-tests"
steps:
- label: ":mac: MacOS x86_64 Unit Tests"
if: build.env("GITHUB_PR_LABELS") =~ /.*(macOS).*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
Expand All @@ -246,7 +246,7 @@ steps:

- label: ":mac: MacOS arm64 Unit Tests"
skip: "https://github.com/elastic/beats/issues/33036"
if: build.env("GITHUB_PR_LABELS") =~ /.*(macOS).*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/x-pack/pipeline.xpack.heartbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ steps:

- group: "x-pack/heartbeat macOS Extended Tests"
key: "x-pack-heartbeat-extended-tests-macos"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/

steps:
- label: ":mac: x-pack/heartbeat macOS x86_64 Unit Tests"
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.metricbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ steps:
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|aws).*/
steps:
- label: ":mac: MacOS x86_64 Unit Tests"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.**/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
Expand All @@ -228,7 +228,7 @@ steps:

- label: ":mac: MacOS arm64 Unit Tests"
skip: "https://github.com/elastic/beats/issues/33036"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.**/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
command: |
set -euo pipefail
source .buildkite/scripts/install_macos_tools.sh
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/x-pack/pipeline.xpack.packetbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ steps:

- group: "x-pack/packetbeat MacOS Extended Tests"
key: "x-pack-packetbeat-extended-macos-tests"
if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
steps:
- label: ":mac: MacOS Unit Tests"
key: "extended-macos-unit-tests"
Expand Down

0 comments on commit 1696517

Please sign in to comment.