Try to fix CI.
This commit is contained in:
36
.github/workflows/main.yml
vendored
36
.github/workflows/main.yml
vendored
@@ -66,6 +66,13 @@ jobs:
|
|||||||
!**/.gitignore
|
!**/.gitignore
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: Linux64-Hashlink
|
||||||
|
path: |
|
||||||
|
templates/bin/hl/linux
|
||||||
|
if-no-files-found: error
|
||||||
|
|
||||||
macos-ndll:
|
macos-ndll:
|
||||||
runs-on: macos-10.15
|
runs-on: macos-10.15
|
||||||
steps:
|
steps:
|
||||||
@@ -115,6 +122,13 @@ jobs:
|
|||||||
!**/.gitignore
|
!**/.gitignore
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: Mac64-Hashlink
|
||||||
|
path: |
|
||||||
|
templates/bin/hl/mac
|
||||||
|
if-no-files-found: error
|
||||||
|
|
||||||
windows-ndll:
|
windows-ndll:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
steps:
|
steps:
|
||||||
@@ -169,6 +183,13 @@ jobs:
|
|||||||
!**/.gitignore
|
!**/.gitignore
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: Windows-Hashlink
|
||||||
|
path: |
|
||||||
|
templates/bin/hl/windows
|
||||||
|
if-no-files-found: error
|
||||||
|
|
||||||
android-ndll:
|
android-ndll:
|
||||||
needs: macos-ndll
|
needs: macos-ndll
|
||||||
runs-on: macos-10.15
|
runs-on: macos-10.15
|
||||||
@@ -355,6 +376,21 @@ jobs:
|
|||||||
name: Windows64-NDLL
|
name: Windows64-NDLL
|
||||||
path: ndll/Windows64/
|
path: ndll/Windows64/
|
||||||
|
|
||||||
|
- uses: actions/download-artifact@v2
|
||||||
|
with:
|
||||||
|
name: Windows-Hashlink
|
||||||
|
path: templates/bin/hl/windows
|
||||||
|
|
||||||
|
- uses: actions/download-artifact@v2
|
||||||
|
with:
|
||||||
|
name: Mac64-Hashlink
|
||||||
|
path: templates/bin/hl/mac
|
||||||
|
|
||||||
|
- uses: actions/download-artifact@v2
|
||||||
|
with:
|
||||||
|
name: Linux64-Hashlink
|
||||||
|
path: templates/bin/hl/linux
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: lime-haxelib
|
name: lime-haxelib
|
||||||
|
|||||||
@@ -659,13 +659,17 @@ class WindowsPlatform extends PlatformTarget
|
|||||||
|
|
||||||
if (!targetFlags.exists("32")
|
if (!targetFlags.exists("32")
|
||||||
&& System.hostArchitecture == X64
|
&& System.hostArchitecture == X64
|
||||||
&& (command != "rebuild" || targetType == "cpp" || targetType == "winrt")
|
&& (command != "rebuild" || targetType == "cpp" || targetType == "winrt"))
|
||||||
&& targetType != "hl")
|
|
||||||
{
|
{
|
||||||
if (targetType == "winrt")
|
if (targetType == "winrt")
|
||||||
{
|
{
|
||||||
commands.push(["-Dwinrt", "-DHXCPP_M64"]);
|
commands.push(["-Dwinrt", "-DHXCPP_M64"]);
|
||||||
}
|
}
|
||||||
|
else if (targetType == "hl")
|
||||||
|
{
|
||||||
|
// TODO: Support single binary
|
||||||
|
commands.push(["-Dwindows", "-DHXCPP_M64", "-Dhashlink"]);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
commands.push(["-Dwindows", "-DHXCPP_M64"]);
|
commands.push(["-Dwindows", "-DHXCPP_M64"]);
|
||||||
|
|||||||
Reference in New Issue
Block a user