diff --git a/README.md b/README.md index 1c5f3827..17f8c928 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,18 @@ This action sets up a Julia environment for use in actions by downloading a spec # Specifying 'default' uses the architecture of the runner executing the job. arch: 'default' + # Force the use of the specified architecture even when it may be suboptimal on the runner. + # + # By default, requesting x86 or x64 on an aarch64 macOS runner (Apple Silicon) will fail with an error, + # as this is usually a misconfiguration. Set this to 'true' to override the error and allow the installation. + # + # Note: x64 Julia can run on Apple Silicon via Rosetta 2, but native aarch64 is typically preferred. + # + # Supported values: true | false + # + # Default: false + force-arch: 'false' + # Set the display setting for printing InteractiveUtils.versioninfo() after installing. # # Starting Julia and running InteractiveUtils.versioninfo() takes a significant amount of time (1s or ~10% of the total build time in testing), diff --git a/action.yml b/action.yml index 091b7ae8..8d2ae5ed 100644 --- a/action.yml +++ b/action.yml @@ -13,6 +13,10 @@ inputs: description: 'Architecture of the Julia binaries. Defaults to the architecture of the runner executing the job.' required: false default: 'default' + force-arch: + description: 'Force the use of the specified architecture even when it may be suboptimal on the runner (e.g., x86 on Apple Silicon macOS runners). By default, requesting x86/x64 on aarch64 macOS runners will fail with an error.' + required: false + default: 'false' show-versioninfo: description: 'Display InteractiveUtils.versioninfo() after installing' required: false diff --git a/src/setup-julia.ts b/src/setup-julia.ts index 587dc67b..f5c47e40 100644 --- a/src/setup-julia.ts +++ b/src/setup-julia.ts @@ -45,6 +45,7 @@ async function run() { const versionInput = core.getInput('version').trim() const includePrereleases = core.getInput('include-all-prereleases').trim() == 'true' const originalArchInput = core.getInput('arch').trim() + const forceArch = core.getInput('force-arch').trim() == 'true' const projectInput = core.getInput('project').trim() // Julia project file // It can easily happen that, for example, a workflow file contains an input `version: ${{ matrix.julia-version }}` @@ -63,7 +64,11 @@ async function run() { } if (originalArchInput == 'x64' && os.platform() == 'darwin' && os.arch() == 'arm64') { - core.warning('[setup-julia] x64 arch has been requested on a macOS runner that has an arm64 (Apple Silicon) architecture. You may have meant to use the "aarch64" arch instead (or left it unspecified for the correct default).') + if (forceArch) { + core.warning('[setup-julia] x64 arch has been requested on a macOS runner that has an arm64 (Apple Silicon) architecture. The "force-arch" input is set to "true", so proceeding with x64 installation. Note that this will mean Julia will be run under Rosetta emulation.') + } else { + throw new Error('[setup-julia] x64 arch has been requested on a macOS runner that has an arm64 (Apple Silicon) architecture. You may have meant to use the "aarch64" arch instead (or "default" or left it unspecified for the correct default). To force the use of x64 on this runner, set the "force-arch" input to "true".') + } } let processedArchInput: string;