Skip to content

Commit c9f9cb7

Browse files
Update ndll build architectures for actions
- Explicitly specify the architecture in more places - Use newer x86_64 to better differentiate from arm64 - Remove Linux and Windows 32 bit builds - Make sure both macos variants (x86_64 and arm64) are built
1 parent a9d5786 commit c9f9cb7

1 file changed

Lines changed: 8 additions & 20 deletions

File tree

.github/workflows/main.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
run: |
108108
haxelib dev lime ${{ github.workspace }}
109109
haxelib run lime rebuild tools -nocolor -verbose -nocffi
110-
haxelib run lime rebuild linux -64 -release -nocolor -verbose -nocffi
110+
haxelib run lime rebuild linux -x86_64 -release -nocolor -verbose -nocffi
111111
112112
- name: Configure Android support
113113
run: |
@@ -163,14 +163,7 @@ jobs:
163163
haxelib install format --quiet
164164
haxelib git hxp https://github.com/Stencyl/hxp.git --quiet
165165
166-
- name: Rebuild Lime tools (Windows)
167-
if: ${{ startsWith(matrix.os, 'windows-') }}
168-
run: |
169-
haxelib dev lime ${{ github.workspace }}
170-
haxelib run lime rebuild tools -nocolor -verbose -nocffi
171-
172-
- name: Rebuild Lime tools (macOS/Linux)
173-
if: ${{ !startsWith(matrix.os, 'windows-') }}
166+
- name: Rebuild Lime tools
174167
run: |
175168
haxelib dev lime ${{ github.workspace }}
176169
haxelib run lime rebuild tools -nocolor -verbose -nocffi
@@ -188,11 +181,7 @@ jobs:
188181
esac
189182
for hl_platform in ${hl_platforms[@]}; do
190183
hl_artifact="hashlink-$hl_semver-$hl_platform.$hl_extension"
191-
if [[ $hl_platform == win* ]]; then
192-
hl_arch="${hl_platform#win}"
193-
else
194-
hl_arch="64"
195-
fi
184+
hl_arch="x86_64"
196185
curl "$hl_url_base/$hl_version/$hl_artifact" -o "$hl_artifact"
197186
case "$hl_extension" in
198187
zip)
@@ -250,7 +239,7 @@ jobs:
250239
run: |
251240
haxelib dev lime ${{ github.workspace }}
252241
haxelib run lime rebuild tools -nocolor -verbose -nocffi
253-
haxelib run lime rebuild macos -release -64 -nocolor -verbose -nocffi
242+
haxelib run lime rebuild macos -arm64 -release -nocolor -verbose -nocffi
254243
255244
- name: Rebuild Lime
256245
run: |
@@ -305,8 +294,7 @@ jobs:
305294
306295
- name: Rebuild Lime
307296
run: |
308-
haxelib run lime rebuild linux -64 -release -verbose -nocolor
309-
haxelib run lime rebuild linux -32 -release -verbose -nocolor
297+
haxelib run lime rebuild linux -x86_64 -release -verbose -nocolor
310298
311299
- name: Upload Release Assets
312300
env:
@@ -352,7 +340,8 @@ jobs:
352340
353341
- name: Rebuild Lime
354342
run: |
355-
haxelib run lime rebuild macos -release -verbose -nocolor
343+
haxelib run lime rebuild macos -arm64 -release -verbose -nocolor
344+
haxelib run lime rebuild macos -x86_64 -release -verbose -nocolor
356345
357346
- name: Upload Release Assets
358347
env:
@@ -398,8 +387,7 @@ jobs:
398387
399388
- name: Rebuild Lime
400389
run: |
401-
haxelib run lime rebuild windows -32 -release -verbose -nocolor
402-
haxelib run lime rebuild windows -64 -release -verbose -nocolor
390+
haxelib run lime rebuild windows -x86_64 -release -verbose -nocolor
403391
404392
- name: Upload Release Assets
405393
env:

0 commit comments

Comments
 (0)