Skip to content

Commit 3a897ae

Browse files
v1vv1v
authored
github-actions: macos-13 sunset (#47216)
1 parent a01f9ad commit 3a897ae

11 files changed

+22
-177
lines changed

‎.github/workflows/auditbeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@ concurrency:
3838
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
3939

4040
jobs:
41-
unit-tests-branch:
41+
unit-tests:
4242
name: Unit tests ${{ matrix.os }}
43-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4443
strategy:
4544
fail-fast: false
4645
matrix:
4746
# Disabled due to: https://github.com/elastic/beats/issues/43482
4847
# TODO uncomment for testing or once solved
49-
os: [macos-13] #, macos-14]
48+
os: [macos-15-intel] #, macos-15]
5049
runs-on: ${{ matrix.os }}
5150
timeout-minutes: 60
5251
steps:
@@ -55,18 +54,3 @@ jobs:
5554
- uses: ./.github/actions/unit-test
5655
with:
5756
beat: ${{ env.BEAT }}
58-
59-
unit-tests-pr:
60-
name: Unit tests macos-15
61-
# Disabled due to: https://github.com/elastic/beats/issues/43482
62-
# TODO: remove the `if: false` and uncomment `if: github.event_name == 'pull_request'`for testing or once solved
63-
if: false
64-
# if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
65-
runs-on: [macos-15]
66-
timeout-minutes: 60
67-
steps:
68-
- uses: actions/checkout@v5
69-
70-
- uses: ./.github/actions/unit-test
71-
with:
72-
beat: ${{ env.BEAT }}

‎.github/workflows/filebeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ concurrency:
3838
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
3939

4040
jobs:
41-
unit-tests-push:
41+
unit-tests:
4242
name: Unit tests ${{ matrix.os }}
43-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4443
strategy:
4544
fail-fast: false
4645
matrix:
47-
os: [macos-13, macos-14]
46+
os: [macos-15-intel, macos-15]
4847
runs-on: ${{ matrix.os }}
4948
timeout-minutes: 60
5049
steps:
@@ -53,15 +52,3 @@ jobs:
5352
- uses: ./.github/actions/unit-test
5453
with:
5554
beat: ${{ env.BEAT }}
56-
57-
unit-tests-pr:
58-
name: Unit tests macos-15
59-
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
60-
runs-on: [macos-15]
61-
timeout-minutes: 60
62-
steps:
63-
- uses: actions/checkout@v5
64-
65-
- uses: ./.github/actions/unit-test
66-
with:
67-
beat: ${{ env.BEAT }}

‎.github/workflows/heartbeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,12 @@ concurrency:
3939
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
4040

4141
jobs:
42-
unit-tests-push:
42+
unit-tests:
4343
name: Unit tests ${{ matrix.os }}
44-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4544
strategy:
4645
fail-fast: false
4746
matrix:
48-
os: [macos-13, macos-14]
47+
os: [macos-15-intel, macos-15]
4948
runs-on: ${{ matrix.os }}
5049
timeout-minutes: 60
5150
steps:
@@ -54,15 +53,3 @@ jobs:
5453
- uses: ./.github/actions/unit-test
5554
with:
5655
beat: ${{ env.BEAT }}
57-
58-
unit-tests-pr:
59-
name: Unit tests macos-15
60-
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
61-
runs-on: [macos-15]
62-
timeout-minutes: 60
63-
steps:
64-
- uses: actions/checkout@v5
65-
66-
- uses: ./.github/actions/unit-test
67-
with:
68-
beat: ${{ env.BEAT }}

‎.github/workflows/metricbeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@ concurrency:
3838
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
3939

4040
jobs:
41-
unit-tests-push:
41+
unit-tests:
4242
name: Unit tests ${{ matrix.os }}
43-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4443
strategy:
4544
fail-fast: false
4645
matrix:
4746
# Disabled due to: https://github.com/elastic/beats/issues/43658
4847
# TODO uncomment for testing or once solved
49-
os: [macos-13] #, macos-14]
48+
os: [macos-15-intel] #, macos-15]
5049
runs-on: ${{ matrix.os }}
5150
timeout-minutes: 60
5251
steps:
@@ -55,18 +54,3 @@ jobs:
5554
- uses: ./.github/actions/unit-test
5655
with:
5756
beat: ${{ env.BEAT }}
58-
59-
unit-tests-pr:
60-
name: Unit tests macos-15
61-
# Disabled due to: https://github.com/elastic/beats/issues/43658
62-
# TODO: remove the `if: false` and uncomment `if: github.event_name == 'pull_request'`for testing or once solved
63-
if: false
64-
# if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
65-
runs-on: [macos-15]
66-
timeout-minutes: 60
67-
steps:
68-
- uses: actions/checkout@v5
69-
70-
- uses: ./.github/actions/unit-test
71-
with:
72-
beat: ${{ env.BEAT }}

‎.github/workflows/packetbeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ concurrency:
3838
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
3939

4040
jobs:
41-
unit-tests-push:
41+
unit-tests:
4242
name: Unit tests ${{ matrix.os }}
43-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4443
strategy:
4544
fail-fast: false
4645
matrix:
47-
os: [macos-13, macos-14]
46+
os: [macos-15-intel, macos-15]
4847
runs-on: ${{ matrix.os }}
4948
timeout-minutes: 60
5049
steps:
@@ -53,15 +52,3 @@ jobs:
5352
- uses: ./.github/actions/unit-test
5453
with:
5554
beat: ${{ env.BEAT }}
56-
57-
unit-tests-pr:
58-
name: Unit tests macos-15
59-
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
60-
runs-on: [macos-15]
61-
timeout-minutes: 60
62-
steps:
63-
- uses: actions/checkout@v5
64-
65-
- uses: ./.github/actions/unit-test
66-
with:
67-
beat: ${{ env.BEAT }}

‎.github/workflows/xpack-auditbeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,12 @@ concurrency:
4444
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
4545

4646
jobs:
47-
unit-tests-push:
47+
unit-tests:
4848
name: Unit tests ${{ matrix.os }}
49-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
5049
strategy:
5150
fail-fast: false
5251
matrix:
53-
os: [macos-13, macos-14]
52+
os: [macos-15-intel, macos-15]
5453
runs-on: ${{ matrix.os }}
5554
timeout-minutes: 60
5655
steps:
@@ -59,15 +58,3 @@ jobs:
5958
- uses: ./.github/actions/unit-test
6059
with:
6160
beat: ${{ env.BEAT }}
62-
63-
unit-tests-pr:
64-
name: Unit tests macos-15
65-
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
66-
runs-on: [macos-15]
67-
timeout-minutes: 60
68-
steps:
69-
- uses: actions/checkout@v5
70-
71-
- uses: ./.github/actions/unit-test
72-
with:
73-
beat: ${{ env.BEAT }}

‎.github/workflows/xpack-filebeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,12 @@ concurrency:
4444
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
4545

4646
jobs:
47-
unit-tests-push:
47+
unit-tests:
4848
name: Unit tests ${{ matrix.os }}
49-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
5049
strategy:
5150
fail-fast: false
5251
matrix:
53-
os: [macos-13, macos-14]
52+
os: [macos-15-intel, macos-15]
5453
runs-on: ${{ matrix.os }}
5554
timeout-minutes: 60
5655
steps:
@@ -59,15 +58,3 @@ jobs:
5958
- uses: ./.github/actions/unit-test
6059
with:
6160
beat: ${{ env.BEAT }}
62-
63-
unit-tests-pr:
64-
name: Unit tests macOS 15
65-
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
66-
runs-on: [macos-15]
67-
timeout-minutes: 60
68-
steps:
69-
- uses: actions/checkout@v5
70-
71-
- uses: ./.github/actions/unit-test
72-
with:
73-
beat: ${{ env.BEAT }}

‎.github/workflows/xpack-heartbeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,13 @@ concurrency:
4343
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
4444

4545
jobs:
46-
unit-tests-push:
46+
unit-tests:
4747
name: Unit tests ${{ matrix.os }}
48-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4948
strategy:
5049
fail-fast: false
5150
max-parallel: 10
5251
matrix:
53-
os: [macos-13, macos-14]
52+
os: [macos-15-intel, macos-15]
5453
runs-on: ${{ matrix.os }}
5554
steps:
5655
- uses: actions/checkout@v5
@@ -64,20 +63,3 @@ jobs:
6463
- uses: ./.github/actions/unit-test
6564
with:
6665
beat: ${{ env.BEAT }}
67-
68-
unit-tests-pr:
69-
name: Unit tests macos-15
70-
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
71-
runs-on: [ macos-15 ]
72-
steps:
73-
- uses: actions/checkout@v5
74-
75-
- uses: actions/setup-node@v5
76-
with:
77-
node-version: ${{ env.NODEJS_VERSION }}
78-
79-
- run: npm i -g @elastic/synthetics
80-
81-
- uses: ./.github/actions/unit-test
82-
with:
83-
beat: ${{ env.BEAT }}

‎.github/workflows/xpack-metricbeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,14 @@ concurrency:
4040
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
4141

4242
jobs:
43-
unit-tests-push:
43+
unit-tests:
4444
name: Unit tests ${{ matrix.os }}
45-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4645
strategy:
4746
fail-fast: false
4847
matrix:
4948
# Disabled due to: https://github.com/elastic/beats/issues/40496
5049
# TODO uncomment for testing or once solved
51-
os: [ macos-13 ] #, macos-14]
50+
os: [ macos-15-intel ] #, macos-15]
5251
runs-on: ${{ matrix.os }}
5352
timeout-minutes: 60
5453
steps:
@@ -57,17 +56,3 @@ jobs:
5756
- uses: ./.github/actions/unit-test
5857
with:
5958
beat: ${{ env.BEAT }}
60-
61-
unit-tests-pr:
62-
name: Unit tests macos-15
63-
# Disabled due to: https://github.com/elastic/beats/issues/40496
64-
# TODO: remove the `if: false` and uncomment `if: github.event_name == 'pull_request'`for testing or once solved
65-
if: false
66-
# if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
67-
runs-on: [macos-15]
68-
steps:
69-
- uses: actions/checkout@v5
70-
71-
- uses: ./.github/actions/unit-test
72-
with:
73-
beat: ${{ env.BEAT }}

‎.github/workflows/xpack-osquerybeat-macos-unit-tests.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,13 @@ concurrency:
4040
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
4141

4242
jobs:
43-
unit-tests-push:
43+
unit-tests:
4444
name: Unit tests ${{ matrix.os }}
45-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4645
strategy:
4746
fail-fast: false
4847
max-parallel: 10
4948
matrix:
50-
os: [macos-13, macos-14]
49+
os: [macos-15-intel, macos-15]
5150
runs-on: ${{ matrix.os }}
5251
timeout-minutes: 60
5352
steps:
@@ -56,15 +55,3 @@ jobs:
5655
- uses: ./.github/actions/unit-test
5756
with:
5857
beat: ${{ env.BEAT }}
59-
60-
unit-tests-pr:
61-
name: Unit tests macos-15
62-
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
63-
runs-on: [macos-15]
64-
timeout-minutes: 60
65-
steps:
66-
- uses: actions/checkout@v5
67-
68-
- uses: ./.github/actions/unit-test
69-
with:
70-
beat: ${{ env.BEAT }}

0 commit comments

Comments
 (0)