From 18ffab2bed322f5a55666b9c0ddb67f0b867f0b8 Mon Sep 17 00:00:00 2001 From: Dimitrios Liappis Date: Thu, 16 May 2024 17:57:28 +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. --- .github/workflows/macos-auditbeat.yml | 41 ------------------ .github/workflows/macos-filebeat.yml | 41 ------------------ .github/workflows/macos-heartbeat.yml | 41 ------------------ .github/workflows/macos-metricbeat.yml | 41 ------------------ .github/workflows/macos-packetbeat.yml | 41 ------------------ .github/workflows/macos-xpack-auditbeat.yml | 41 ------------------ .github/workflows/macos-xpack-filebeat.yml | 41 ------------------ .../workflows/macos-xpack-functionbeat.yml | 41 ------------------ .github/workflows/macos-xpack-heartbeat.yml | 43 ------------------- .github/workflows/macos-xpack-metricbeat.yml | 41 ------------------ .github/workflows/macos-xpack-osquerybeat.yml | 41 ------------------ .github/workflows/macos-xpack-packetbeat.yml | 41 ------------------ 12 files changed, 494 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/.github/workflows/macos-auditbeat.yml b/.github/workflows/macos-auditbeat.yml deleted file mode 100644 index 994ca6dbebc..00000000000 --- a/.github/workflows/macos-auditbeat.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: auditbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-auditbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'auditbeat' - -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 6b43f5bb6c6..00000000000 --- a/.github/workflows/macos-filebeat.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: filebeat - -on: - pull_request: - paths: - - '.github/workflows/macos-filebeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'filebeat' - -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 c8e346a4402..00000000000 --- a/.github/workflows/macos-heartbeat.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: heartbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-heartbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'heartbeat' - -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 59a225e1601..00000000000 --- a/.github/workflows/macos-metricbeat.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: metricbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-metricbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'metricbeat' - -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 be5dc7377e6..00000000000 --- a/.github/workflows/macos-packetbeat.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: packetbeat - -on: - pull_request: - paths: - - '.github/workflows/macos-packetbeat.yml' - push: - branches: - - main - - 7.1* - - 8.* - -env: - BEAT_MODULE: 'packetbeat' - -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 3adcb46f6da..00000000000 --- a/.github/workflows/macos-xpack-auditbeat.yml +++ /dev/null @@ -1,41 +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' - -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 936c0913fa4..00000000000 --- a/.github/workflows/macos-xpack-filebeat.yml +++ /dev/null @@ -1,41 +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' - -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 26a3e311c92..00000000000 --- a/.github/workflows/macos-xpack-functionbeat.yml +++ /dev/null @@ -1,41 +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' - -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 8a0c6c1897d..00000000000 --- a/.github/workflows/macos-xpack-heartbeat.yml +++ /dev/null @@ -1,43 +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' - -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 38f40b051bc..00000000000 --- a/.github/workflows/macos-xpack-metricbeat.yml +++ /dev/null @@ -1,41 +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' - -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 1b3be3e3148..00000000000 --- a/.github/workflows/macos-xpack-osquerybeat.yml +++ /dev/null @@ -1,41 +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' - -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 90d9f77e269..00000000000 --- a/.github/workflows/macos-xpack-packetbeat.yml +++ /dev/null @@ -1,41 +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' - -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 }}