Skip to content

Commit b2cb1e1

Browse files
authored
Merge pull request #36 from docker/fix-ghes
do not use arm runners on GHES
2 parents b538b3b + 2a5e3b7 commit b2cb1e1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/bake.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ jobs:
185185
script: |
186186
const os = require('os');
187187
const { Bake } = require('@docker/actions-toolkit/lib/buildx/bake');
188+
const { GitHub } = require('@docker/actions-toolkit/lib/github');
188189
const { Util } = require('@docker/actions-toolkit/lib/util');
189190
190191
const inpMatrixSizeLimit = parseInt(core.getInput('matrix-size-limit'), 10);
@@ -241,7 +242,7 @@ jobs:
241242
includes.push({
242243
index: index,
243244
platform: platform,
244-
runner: platform.startsWith('linux/arm') ? 'ubuntu-24.04-arm' : 'ubuntu-24.04'
245+
runner: GitHub.isGHES && platform.startsWith('linux/arm') ? 'ubuntu-24.04-arm' : 'ubuntu-24.04'
245246
});
246247
});
247248
}

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ jobs:
175175
INPUT_BUILD-PLATFORMS: ${{ inputs.build-platforms }}
176176
with:
177177
script: |
178+
const { GitHub } = require('@docker/actions-toolkit/lib/github');
178179
const { Util } = require('@docker/actions-toolkit/lib/util');
179180
180181
const inpMatrixSizeLimit = parseInt(core.getInput('matrix-size-limit'), 10);
@@ -195,7 +196,7 @@ jobs:
195196
includes.push({
196197
index: index,
197198
platform: platform,
198-
runner: platform.startsWith('linux/arm') ? 'ubuntu-24.04-arm' : 'ubuntu-24.04'
199+
runner: GitHub.isGHES && platform.startsWith('linux/arm') ? 'ubuntu-24.04-arm' : 'ubuntu-24.04'
199200
});
200201
});
201202
}

0 commit comments

Comments
 (0)