Skip to content

Fix arm64 Linux runner OS detection #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtdowney wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix arm64 Linux runner OS detection #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55370,10 +55370,15 @@ function getRunnerOSVersion() {
ubuntu18: 'ubuntu-18.04',
ubuntu20: 'ubuntu-20.04',
}
const containerFromEnvImageOS = ImageOSToContainer[process.env.ImageOS]
// actions/runner-images PR #14113 gave arm64 images distinct ImageOS values
// (e.g. ImageOS=ubuntu24-arm64 instead of ubuntu24). The CPU architecture is
// resolved separately via RUNNER_ARCH, so the arm64 variants map to the same
// OS container as their x86 counterparts.
const imageOS = (process.env.ImageOS || '').replace(/-arm64$/, '')
const containerFromEnvImageOS = ImageOSToContainer[imageOS]
if (!containerFromEnvImageOS) {
const deprecatedContainerFromEnvImageOS =
deprecatedImageOSToContainer[process.env.ImageOS]
deprecatedImageOSToContainer[imageOS]
if (deprecatedContainerFromEnvImageOS) {
warning(
`You are using deprecated ImageOS ${deprecatedContainerFromEnvImageOS}. ` +
Expand Down Expand Up @@ -55993,6 +55998,7 @@ function debugLoggingEnabled() {
getGleamVersion,
getOTPVersion,
getRebar3Version,
getRunnerOSVersion,
getVersionFromSpec,
githubAMDRunnerArchs,
githubARMRunnerArchs,
Expand Down
10 changes: 8 additions & 2 deletions src/setup-beam.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,10 +676,15 @@ function getRunnerOSVersion() {
ubuntu18: 'ubuntu-18.04',
ubuntu20: 'ubuntu-20.04',
}
const containerFromEnvImageOS = ImageOSToContainer[process.env.ImageOS]
// actions/runner-images PR #14113 gave arm64 images distinct ImageOS values
// (e.g. ImageOS=ubuntu24-arm64 instead of ubuntu24). The CPU architecture is
// resolved separately via RUNNER_ARCH, so the arm64 variants map to the same
// OS container as their x86 counterparts.
const imageOS = (process.env.ImageOS || '').replace(/-arm64$/, '')
const containerFromEnvImageOS = ImageOSToContainer[imageOS]
if (!containerFromEnvImageOS) {
const deprecatedContainerFromEnvImageOS =
deprecatedImageOSToContainer[process.env.ImageOS]
deprecatedImageOSToContainer[imageOS]
if (deprecatedContainerFromEnvImageOS) {
core.warning(
`You are using deprecated ImageOS ${deprecatedContainerFromEnvImageOS}. ` +
Expand Down Expand Up @@ -1299,6 +1304,7 @@ export default {
getGleamVersion,
getOTPVersion,
getRebar3Version,
getRunnerOSVersion,
getVersionFromSpec,
githubAMDRunnerArchs,
githubARMRunnerArchs,
Expand Down
38 changes: 38 additions & 0 deletions test/setup-beam.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,44 @@ describe('OTP arch-specific install', () => {
})
})

describe('.getRunnerOSVersion(_)', () => {
it('maps x86 ImageOS values to their container', async () => {
const previousImageOS = process.env.ImageOS

process.env.ImageOS = 'ubuntu22'
assert.strictEqual(setupBeam.getRunnerOSVersion(), 'ubuntu-22.04')

process.env.ImageOS = 'ubuntu24'
assert.strictEqual(setupBeam.getRunnerOSVersion(), 'ubuntu-24.04')

process.env.ImageOS = previousImageOS
})

it('maps arm64 ImageOS variants to the same container as x86', async () => {
const previousImageOS = process.env.ImageOS

process.env.ImageOS = 'ubuntu22-arm64'
assert.strictEqual(setupBeam.getRunnerOSVersion(), 'ubuntu-22.04')

process.env.ImageOS = 'ubuntu24-arm64'
assert.strictEqual(setupBeam.getRunnerOSVersion(), 'ubuntu-24.04')

process.env.ImageOS = previousImageOS
})

it('throws for genuinely unknown ImageOS values', async () => {
const previousImageOS = process.env.ImageOS

process.env.ImageOS = 'plan9'
assert.throws(
() => setupBeam.getRunnerOSVersion(),
/Tried to map a target OS/,
)

process.env.ImageOS = previousImageOS
})
})

describe('.getOTPVersion(_) - Elixir', () => {
let got
let expected
Expand Down