Skip to content
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
devScript: ./dev.sh

- runtime: linux-arm64
os: ubuntu-latest
os: ubuntu-24.04-arm
devScript: ./dev.sh

- runtime: linux-arm
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
${{ matrix.devScript }} test
working-directory: src
if: matrix.runtime != 'linux-arm64' && matrix.runtime != 'linux-arm' && matrix.runtime != 'osx-arm64' && matrix.runtime != 'win-arm64'
if: matrix.runtime != 'linux-arm' && matrix.runtime != 'osx-arm64' && matrix.runtime != 'win-arm64'

# Create runner package tar.gz/zip
- name: Package Release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
devScript: ./dev.sh

- runtime: linux-arm64
os: ubuntu-latest
os: ubuntu-24.04-arm
devScript: ./dev.sh

- runtime: linux-arm
Expand Down
1 change: 1 addition & 0 deletions src/Misc/externals.sh
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ fi

if [[ "$PACKAGERUNTIME" == "linux-arm64" ]]; then
acquireExternalTool "$NODE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-linux-arm64.tar.gz" node20 fix_nested_dir
acquireExternalTool "$NODE_ALPINE_URL/v${NODE20_VERSION}/node-v${NODE20_VERSION}-alpine-arm64.tar.gz" node20_alpine
fi

if [[ "$PACKAGERUNTIME" == "linux-arm" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions src/Runner.Worker/Handlers/StepHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,11 @@ await containerHookManager.RunScriptStepAsync(context,
private string CheckPlatformForAlpineContainer(IExecutionContext executionContext, string preferredVersion)
{
string nodeExternal = preferredVersion;
if (!Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.X64))
if (!Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.X64) && !Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.Arm64))
{
var os = Constants.Runner.Platform.ToString();
var arch = Constants.Runner.PlatformArchitecture.ToString();
var msg = $"JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected {os} {arch}";
var msg = $"JavaScript Actions in Alpine containers are only supported on x64 and arm64 Linux runners. Detected {os} {arch}";
throw new NotSupportedException(msg);
}
nodeExternal = $"{preferredVersion}_alpine";
Expand Down