Skip to content

Commit

Permalink
Merge branch '8.3.0-Dev' into linux-aarch64
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcagabe19
mcagabe19 authored Nov 11, 2024
2 parents 5147a43 + d1dd5bc commit b94ab23
Show file tree
Hide file tree
Showing 30 changed files with 579 additions and 222 deletions.
102 changes: 54 additions & 48 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -29,7 +29,8 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp 4.2.1 --quiet
curl --output ../hxcpp-4.3.45.zip --location https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
haxelib install ../hxcpp-4.3.45.zip --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand All @@ -49,23 +50,23 @@ jobs:
lime rebuild linux -64 -release -nocolor -verbose -nocffi
lime rebuild hl -clean -release -nocolor -verbose -nocffi
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Linux-NDLL
path: |
ndll/Linux/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Linux64-NDLL
path: |
ndll/Linux64/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Linux64-Hashlink
path: |
Expand Down Expand Up @@ -179,7 +180,7 @@ jobs:
runs-on: macos-12
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -204,8 +205,8 @@ jobs:
- name: Install Haxe dependencies
run: |
curl -LO https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
haxelib install ./hxcpp-4.3.45.zip --quiet
curl --output ../hxcpp-4.3.45.zip --location https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
haxelib install ../hxcpp-4.3.45.zip --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand All @@ -225,23 +226,23 @@ jobs:
lime rebuild macos -clean -release -arm64 -nocolor -verbose -nocffi
lime rebuild hl -clean -release -nocolor -verbose -nocffi
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Mac64-NDLL
path: |
ndll/Mac64/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: MacArm64-NDLL
path: |
ndll/MacArm64/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Mac64-Hashlink
path: |
Expand Down Expand Up @@ -271,7 +272,7 @@ jobs:
runs-on: windows-latest
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -289,7 +290,8 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp 4.2.1 --quiet
curl --output ../hxcpp-4.3.45.zip --location https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
haxelib install ../hxcpp-4.3.45.zip --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand All @@ -310,29 +312,29 @@ jobs:
lime rebuild windows -arm64 -release -nocolor -verbose -nocffi -D HXCPP_ARM64
lime rebuild hl -clean -release -nocolor -verbose -nocffi
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Windows-NDLL
path: |
ndll/Windows/
!**/.gitignore
if-no-files-found: error

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Windows64-NDLL
path: |
ndll/Windows64/
!**/.gitignore
if-no-files-found: error

# - uses: actions/upload-artifact@v3
# - uses: actions/upload-artifact@v4
# with:
# name: Windows-Hashlink
# path: |
# templates/bin/hl/Windows
# if-no-files-found: error
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Windows64-Hashlink
path: |
Expand Down Expand Up @@ -362,7 +364,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -372,7 +374,7 @@ jobs:
with:
ndk-version: r21e

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "zulu"
java-version: 11
Expand All @@ -387,7 +389,8 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp 4.2.1 --quiet
curl --output ../hxcpp-4.3.45.zip --location https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
haxelib install ../hxcpp-4.3.45.zip --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand All @@ -412,7 +415,7 @@ jobs:
run: |
lime rebuild android -release -nocolor -verbose -nocffi -eval
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Android-NDLL
path: |
Expand Down Expand Up @@ -442,7 +445,7 @@ jobs:
runs-on: macos-12
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -456,7 +459,8 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp 4.2.1 --quiet
curl --output ../hxcpp-4.3.45.zip --location https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
haxelib install ../hxcpp-4.3.45.zip --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand All @@ -473,7 +477,7 @@ jobs:
run: |
lime rebuild ios -clean -release -verbose -nocolor -eval
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: iPhone-NDLL
path: |
Expand Down Expand Up @@ -505,7 +509,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -519,7 +523,8 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp 4.2.1 --quiet
curl --output ../hxcpp-4.3.45.zip --location https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
haxelib install ../hxcpp-4.3.45.zip --quiet
haxelib install format --quiet
haxelib install hxp --quiet
haxelib install svg --quiet
Expand All @@ -540,62 +545,62 @@ jobs:
cp project/lib/hashlink/src/hl.h templates/bin/hl/include/hl.h
cp project/lib/hashlink/src/hlc_main.c templates/bin/hl/include/hlc_main.c
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Android-NDLL
path: ndll/Android/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: iPhone-NDLL
path: ndll/iPhone/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Linux-NDLL
path: ndll/Linux/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Linux64-NDLL
path: ndll/Linux64/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Mac64-NDLL
path: ndll/Mac64/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: MacArm64-NDLL
path: ndll/MacArm64/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Windows-NDLL
path: ndll/Windows/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Windows64-NDLL
path: ndll/Windows64/

# - uses: actions/download-artifact@v3
# - uses: actions/download-artifact@v4
# with:
# name: Windows-Hashlink
# path: templates/bin/hl/Windows

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Windows64-Hashlink
path: templates/bin/hl/Windows64

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Mac64-Hashlink
path: templates/bin/hl/Mac64

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: Linux64-Hashlink
path: templates/bin/hl/Linux64
Expand All @@ -605,7 +610,7 @@ jobs:
run: |
haxe svg.hxml
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lime-haxelib
path: |
Expand All @@ -620,7 +625,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: krdlab/setup-haxe@v1
with:
Expand All @@ -640,7 +645,7 @@ jobs:
run: |
haxe build.hxml
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lime-docs
path: docs/pages
Expand All @@ -650,7 +655,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: krdlab/setup-haxe@v1
with:
Expand Down Expand Up @@ -693,7 +698,7 @@ jobs:
haxe-version: [4.0.5, 4.1.5, 4.2.5, 4.3.1]
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -712,7 +717,8 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp 4.2.1 --quiet
curl --output ../hxcpp-4.3.45.zip --location https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
haxelib install ../hxcpp-4.3.45.zip --quiet
haxelib install format --quiet
haxelib install hxp --quiet
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
Expand Down Expand Up @@ -763,7 +769,7 @@ jobs:
run: |
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: lime-haxelib
path: lime-haxelib
Expand Down Expand Up @@ -813,7 +819,7 @@ jobs:
run: |
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: lime-haxelib
path: lime-haxelib
Expand Down Expand Up @@ -842,7 +848,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: krdlab/setup-haxe@v1
with:
Expand Down Expand Up @@ -920,7 +926,7 @@ jobs:
run: |
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: lime-haxelib
path: lime-haxelib
Expand Down
Loading

0 comments on commit b94ab23

Please sign in to comment.