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
12 changes: 8 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,13 @@ jobs:
- 4.3.7
- 3.4.7
include:
- lib_hxml: lib.hxml
- haxe: 3.4.7
lib_hxml: lib_haxe3.hxml
hxml_suffix: _haxe3
- haxe: latest
os: ubuntu-24.04-arm

env:
TEST_LIB_HXML: test-workflow/lib${{ matrix.hxml_suffix }}.hxml

steps:

Expand All @@ -57,11 +61,11 @@ jobs:
uses: ./
with:
haxe-version: ${{ matrix.haxe }}
cache-dependency-path: 'test-workflow/${{ matrix.lib_hxml }}'
cache-dependency-path: ${{ env.TEST_LIB_HXML }}

- run: haxe -version

- run: haxelib install test-workflow/${{ matrix.lib_hxml }} --always
- run: haxelib install ${{ env.TEST_LIB_HXML }} --always

- name: Compile test code
run: |
Expand Down
9 changes: 6 additions & 3 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ class NekoAsset extends Asset {
if (this.env.platform === 'osx' && this.version.startsWith('2.4')) {
return 'osx-universal';
}
if (this.env.platform === 'linux' && this.env.arch === 'arm64') {
return 'linux-arm64';
}
return `${this.env.platform}${this.env.arch}`;
}
get fileNameWithoutExt() {
Expand Down Expand Up @@ -252,7 +255,7 @@ class HaxeAsset extends Asset {
return 'mac';
}
case 'linux': {
return 'linux64';
return this.env.arch === 'arm64' ? 'linux-arm64' : 'linux64';
}
case 'win': {
return 'windows64';
Expand Down Expand Up @@ -295,8 +298,8 @@ class Env {
if (arch === 'x64') {
return '64';
}
if (arch === 'arm64' && this.platform === 'osx') {
return '64';
if (arch === 'arm64') {
return this.platform === 'osx' ? '64' : 'arm64';
}
throw new Error(`${arch} not supported`);
}
Expand Down
10 changes: 7 additions & 3 deletions src/asset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ export class NekoAsset extends Asset {
return 'osx-universal';
}

if (this.env.platform === 'linux' && this.env.arch === 'arm64') {
return 'linux-arm64';
}

return `${this.env.platform}${this.env.arch}`;
}

Expand Down Expand Up @@ -224,7 +228,7 @@ export class HaxeAsset extends Asset {
}

case 'linux': {
return 'linux64';
return this.env.arch === 'arm64' ? 'linux-arm64' : 'linux64';
}

case 'win': {
Expand Down Expand Up @@ -279,8 +283,8 @@ export class Env {
return '64';
}

if (arch === 'arm64' && this.platform === 'osx') {
return '64';
if (arch === 'arm64') {
return this.platform === 'osx' ? '64' : 'arm64';
}

throw new Error(`${arch} not supported`);
Expand Down