Skip to content

Commit f060eaf

Browse files
committed
chore: macos-latest is mandatory, so skip docker tests on macos
1 parent 9f8f030 commit f060eaf

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

.github/workflows/code-health-fork.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ jobs:
1313
if: github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.head.repo.full_name != github.repository
1414
strategy:
1515
matrix:
16-
# we use macos-13 instead of macos-latest because GHA runners on ARM do not support docker
17-
# see https://github.com/docker/setup-docker-action/pull/53
18-
os: [ubuntu-latest, macos-13, windows-latest]
16+
os: [ubuntu-latest, macos-latest, windows-latest]
1917
fail-fast: false
2018
runs-on: ${{ matrix.os }}
2119
steps:
2220
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
2321
if: matrix.os == 'ubuntu-latest'
2422
- uses: actions/checkout@v5
2523
- uses: docker/setup-docker-action@v4
24+
if: matrix.os != 'macos-latest'
2625
name: Setup Docker Environment
2726
with:
2827
set-host: true

.github/workflows/code-health.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@ jobs:
1414
if: github.event_name == 'push' || (github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository)
1515
strategy:
1616
matrix:
17-
# we use macos-13 instead of macos-latest because GHA runners on ARM do not support docker
18-
# see https://github.com/docker/setup-docker-action/pull/53
19-
os: [ubuntu-latest, macos-13, windows-latest]
17+
os: [ubuntu-latest, macos-latest, windows-latest]
2018
fail-fast: false
2119
runs-on: ${{ matrix.os }}
2220
steps:
2321
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
2422
if: matrix.os == 'ubuntu-latest'
2523
- uses: actions/checkout@v5
2624
- uses: docker/setup-docker-action@v4
25+
if: matrix.os != 'macos-latest'
2726
name: Setup Docker Environment
2827
with:
2928
set-host: true
@@ -49,10 +48,6 @@ jobs:
4948
steps:
5049
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
5150
- uses: actions/checkout@v5
52-
- uses: docker/setup-docker-action@v4
53-
name: Setup Docker Environment
54-
with:
55-
set-host: true
5651
- uses: actions/setup-node@v5
5752
with:
5853
node-version-file: package.json

0 commit comments

Comments
 (0)