Skip to content

Commit

Permalink
Merge branch 'develop' into 8.3.0-Dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshtynjala
joshtynjala committed Nov 5, 2024
2 parents 7c96738 + 36b14e9 commit d1dd5bc
Show file tree
Hide file tree
Showing 31 changed files with 547 additions and 246 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 @@ -95,7 +96,7 @@ jobs:
runs-on: macos-12
steps:

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

Expand All @@ -120,8 +121,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 @@ -141,23 +142,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 @@ -187,7 +188,7 @@ jobs:
runs-on: windows-latest
steps:

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

Expand All @@ -201,7 +202,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 @@ -221,29 +223,29 @@ jobs:
lime rebuild windows -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: 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 @@ -273,7 +275,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

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

Expand All @@ -283,7 +285,7 @@ jobs:
with:
ndk-version: r21e

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "zulu"
java-version: 11
Expand All @@ -298,7 +300,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 @@ -323,7 +326,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 @@ -353,7 +356,7 @@ jobs:
runs-on: macos-12
steps:

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

Expand All @@ -367,7 +370,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 @@ -384,7 +388,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 @@ -416,7 +420,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

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

Expand All @@ -430,7 +434,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 @@ -451,62 +456,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 @@ -516,7 +521,7 @@ jobs:
run: |
haxe svg.hxml
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lime-haxelib
path: |
Expand All @@ -531,7 +536,7 @@ jobs:
runs-on: ubuntu-20.04
steps:

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

- uses: krdlab/setup-haxe@v1
with:
Expand All @@ -551,7 +556,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 @@ -561,7 +566,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 @@ -604,7 +609,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 @@ -623,7 +628,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 @@ -674,7 +680,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 @@ -724,7 +730,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 @@ -753,7 +759,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 @@ -831,7 +837,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 d1dd5bc

Please sign in to comment.