From 2aef900171dd2c2e5c8df91c6729a0e2254daecd Mon Sep 17 00:00:00 2001 From: Dimitrios Liappis Date: Thu, 16 May 2024 17:42:19 +0300 Subject: [PATCH] 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. --- .buildkite/auditbeat/auditbeat-pipeline.yml | 4 +- .buildkite/filebeat/filebeat-pipeline.yml | 4 +- .buildkite/heartbeat/heartbeat-pipeline.yml | 2 +- .buildkite/metricbeat/pipeline.yml | 2 +- .buildkite/packetbeat/pipeline.packetbeat.yml | 2 +- .../x-pack/pipeline.xpack.auditbeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.filebeat.yml | 4 +- .../x-pack/pipeline.xpack.heartbeat.yml | 2 +- .../x-pack/pipeline.xpack.metricbeat.yml | 4 +- .../x-pack/pipeline.xpack.packetbeat.yml | 2 +- .github/workflows/macos-auditbeat.yml | 44 ------------------ .github/workflows/macos-filebeat.yml | 44 ------------------ .github/workflows/macos-heartbeat.yml | 44 ------------------ .github/workflows/macos-metricbeat.yml | 44 ------------------ .github/workflows/macos-packetbeat.yml | 44 ------------------ .github/workflows/macos-xpack-auditbeat.yml | 44 ------------------ .github/workflows/macos-xpack-filebeat.yml | 44 ------------------ .../workflows/macos-xpack-functionbeat.yml | 44 ------------------ .github/workflows/macos-xpack-heartbeat.yml | 46 ------------------- .github/workflows/macos-xpack-metricbeat.yml | 44 ------------------ .github/workflows/macos-xpack-osquerybeat.yml | 44 ------------------ .github/workflows/macos-xpack-packetbeat.yml | 44 ------------------ 22 files changed, 14 insertions(+), 544 deletions(-) delete mode 100644 .github/workflows/macos-auditbeat.yml delete mode 100644 .github/workflows/macos-filebeat.yml delete mode 100644 .github/workflows/macos-heartbeat.yml delete mode 100644 .github/workflows/macos-metricbeat.yml delete mode 100644 .github/workflows/macos-packetbeat.yml delete mode 100644 .github/workflows/macos-xpack-auditbeat.yml delete mode 100644 .github/workflows/macos-xpack-filebeat.yml delete mode 100644 .github/workflows/macos-xpack-functionbeat.yml delete mode 100644 .github/workflows/macos-xpack-heartbeat.yml delete mode 100644 .github/workflows/macos-xpack-metricbeat.yml delete mode 100644 .github/workflows/macos-xpack-osquerybeat.yml delete mode 100644 .github/workflows/macos-xpack-packetbeat.yml diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml index 0b0efac5ed6..2ac4a8911a1 100644 --- a/.buildkite/auditbeat/auditbeat-pipeline.yml +++ b/.buildkite/auditbeat/auditbeat-pipeline.yml @@ -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 @@ -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 diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index c7ac3072a84..87f1925a372 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -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 @@ -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 diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml index cdb3959c253..dc27b45f1ac 100644 --- a/.buildkite/heartbeat/heartbeat-pipeline.yml +++ b/.buildkite/heartbeat/heartbeat-pipeline.yml @@ -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" diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index f4a04dbb0c2..ed9fb14f3d4 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -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" diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml index 74873046c56..c9a5c9f06f2 100644 --- a/.buildkite/packetbeat/pipeline.packetbeat.yml +++ b/.buildkite/packetbeat/pipeline.packetbeat.yml @@ -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 diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml index 14a79eb76d9..2e13a0d9b95 100644 --- a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml @@ -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: | diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml index 1707bca29ec..f986af28653 100644 --- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml @@ -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 @@ -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 diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index 3ccb94bdf5e..3a833f369e2 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -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" diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml index fb75291dde0..701e01c972f 100644 --- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml @@ -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 @@ -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 diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml index 117824689a9..80bf88843d7 100644 --- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml @@ -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" diff --git a/.github/workflows/macos-auditbeat.yml b/.github/workflows/macos-auditbeat.yml deleted file mode 100644 index 39c97c8b719..00000000000 --- a/.github/workflows/macos-auditbeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: auditbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-auditbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'auditbeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-filebeat.yml b/.github/workflows/macos-filebeat.yml deleted file mode 100644 index 513b87be316..00000000000 --- a/.github/workflows/macos-filebeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: filebeat - -on: - pull_request: - paths: - - '.github/workflows/macos-filebeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'filebeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-heartbeat.yml b/.github/workflows/macos-heartbeat.yml deleted file mode 100644 index b707e9c7d42..00000000000 --- a/.github/workflows/macos-heartbeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: heartbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-heartbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'heartbeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-metricbeat.yml b/.github/workflows/macos-metricbeat.yml deleted file mode 100644 index 0f37cfb937b..00000000000 --- a/.github/workflows/macos-metricbeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: metricbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-metricbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'metricbeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && echo "See https://github.com/elastic/beats/issues/29038" - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-packetbeat.yml b/.github/workflows/macos-packetbeat.yml deleted file mode 100644 index bebbc5eed90..00000000000 --- a/.github/workflows/macos-packetbeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: packetbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-packetbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'packetbeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-xpack-auditbeat.yml b/.github/workflows/macos-xpack-auditbeat.yml deleted file mode 100644 index e0484908a9e..00000000000 --- a/.github/workflows/macos-xpack-auditbeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: x-pack-auditbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-xpack-auditbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'x-pack/auditbeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-xpack-filebeat.yml b/.github/workflows/macos-xpack-filebeat.yml deleted file mode 100644 index 93950c24b57..00000000000 --- a/.github/workflows/macos-xpack-filebeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: x-pack-filebeat - -on: - pull_request: - paths: - - '.github/workflows/macos-xpack-filebeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'x-pack/filebeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-xpack-functionbeat.yml b/.github/workflows/macos-xpack-functionbeat.yml deleted file mode 100644 index 430d8834bb4..00000000000 --- a/.github/workflows/macos-xpack-functionbeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: x-pack-functionbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-xpack-functionbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'x-pack/functionbeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-xpack-heartbeat.yml b/.github/workflows/macos-xpack-heartbeat.yml deleted file mode 100644 index 9c4995ce20d..00000000000 --- a/.github/workflows/macos-xpack-heartbeat.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: x-pack-heartbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-xpack-heartbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'x-pack/heartbeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: | - go install github.com/magefile/mage - cd ${{ env.BEAT_MODULE }} && npm install -g @elastic/synthetics - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-xpack-metricbeat.yml b/.github/workflows/macos-xpack-metricbeat.yml deleted file mode 100644 index 2d2531cd286..00000000000 --- a/.github/workflows/macos-xpack-metricbeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: x-pack-metricbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-xpack-metricbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'x-pack/metricbeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-xpack-osquerybeat.yml b/.github/workflows/macos-xpack-osquerybeat.yml deleted file mode 100644 index 7678df4b2f2..00000000000 --- a/.github/workflows/macos-xpack-osquerybeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: x-pack-osquerybeat - -on: - pull_request: - paths: - - '.github/workflows/macos-xpack-osquerybeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'x-pack/osquerybeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/macos-xpack-packetbeat.yml b/.github/workflows/macos-xpack-packetbeat.yml deleted file mode 100644 index 8167486eb0c..00000000000 --- a/.github/workflows/macos-xpack-packetbeat.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: x-pack-packetbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-xpack-packetbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'x-pack/packetbeat' - -permissions: - contents: read - -jobs: - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 - with: - go-version-file: .go-version - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install dependencies - run: go install github.com/magefile/mage - - name: Run build - run: cd ${{ env.BEAT_MODULE }} && mage build - - name: Run test - run: cd ${{ env.BEAT_MODULE }} && mage unitTest - - uses: v1v/otel-upload-test-artifact-action@v2 - if: always() - continue-on-error: true - with: - jobName: "macos" - stepName: "Run test" - path: "${{ env.BEAT_MODULE }}/build/TEST*.xml" - type: "junit" - githubToken: ${{ secrets.GITHUB_TOKEN }}