Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions __tests__/github-builder/runner-mapping.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@ describe('parse', () => {
});

it.each([
['amd64', 'ubuntu-24.04'],
['arm64', 'ubuntu-24.04-arm']
['amd64', 'ubuntu-26.04'],
['arm64', 'ubuntu-26.04-arm']
])('preserves deprecated alias %s and its warning', (alias, runner) => {
expect(RunnerMapping.parse([alias])).toEqual({defaultRunner: runner, rules: []});
expect(core.warning).toHaveBeenCalledExactlyOnceWith(`The runner input value "${alias}" is deprecated; use runner=${runner} instead`);
});

it('preserves auto mappings and its warning', () => {
expect(RunnerMapping.parse(['auto'])).toEqual({
defaultRunner: 'ubuntu-24.04',
defaultRunner: 'ubuntu-26.04',
rules: [
{pattern: 'linux/arm', runner: 'ubuntu-24.04-arm'},
{pattern: 'linux/arm64', runner: 'ubuntu-24.04-arm'}
{pattern: 'linux/arm', runner: 'ubuntu-26.04-arm'},
{pattern: 'linux/arm64', runner: 'ubuntu-26.04-arm'}
]
});
expect(core.warning).toHaveBeenCalledExactlyOnceWith('The runner input value "auto" is deprecated; use a runner mapping with default=ubuntu-24.04, linux/arm=ubuntu-24.04-arm, and linux/arm64=ubuntu-24.04-arm instead');
expect(core.warning).toHaveBeenCalledExactlyOnceWith('The runner input value "auto" is deprecated; use a runner mapping with default=ubuntu-26.04, linux/arm=ubuntu-26.04-arm, and linux/arm64=ubuntu-26.04-arm instead');
});

it('does not expand aliases used as mapping values', () => {
Expand Down
10 changes: 5 additions & 5 deletions src/github-builder/runner-mapping.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ export class RunnerMapping {
if (lines.length === 1 && !lines[0].includes('=')) {
const label = lines[0];
if (label === 'auto') {
core.warning('The runner input value "auto" is deprecated; use a runner mapping with default=ubuntu-24.04, linux/arm=ubuntu-24.04-arm, and linux/arm64=ubuntu-24.04-arm instead');
core.warning('The runner input value "auto" is deprecated; use a runner mapping with default=ubuntu-26.04, linux/arm=ubuntu-26.04-arm, and linux/arm64=ubuntu-26.04-arm instead');
return {
defaultRunner: 'ubuntu-24.04',
defaultRunner: 'ubuntu-26.04',
rules: [
{pattern: 'linux/arm', runner: 'ubuntu-24.04-arm'},
{pattern: 'linux/arm64', runner: 'ubuntu-24.04-arm'}
{pattern: 'linux/arm', runner: 'ubuntu-26.04-arm'},
{pattern: 'linux/arm64', runner: 'ubuntu-26.04-arm'}
]
};
}
if (label === 'amd64' || label === 'arm64') {
const runner = label === 'amd64' ? 'ubuntu-24.04' : 'ubuntu-24.04-arm';
const runner = label === 'amd64' ? 'ubuntu-26.04' : 'ubuntu-26.04-arm';
core.warning(`The runner input value "${label}" is deprecated; use runner=${runner} instead`);
return {defaultRunner: runner, rules: []};
}
Expand Down
Loading