Skip to content

Commit

Permalink
Merge branch '8.2.0-Dev' into mingw-fixes-8.2.0-Dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@player-03
player-03 authored Jan 12, 2024
2 parents c7c386d + 24bc9b2 commit 35d6050
Show file tree
Hide file tree
Showing 1,896 changed files with 188,688 additions and 9,722 deletions.
153 changes: 77 additions & 76 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ jobs:

linux-ndll:
runs-on: ubuntu-20.04
strategy:
matrix:
haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5]
steps:

- uses: actions/checkout@v3
Expand All @@ -21,15 +18,15 @@ jobs:
- uses: krdlab/setup-haxe@v1
with:
haxe-version: ${{ matrix.haxe-version }}
haxe-version: 4.2.5

- name: Set HAXEPATH
run: |
echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand All @@ -50,7 +47,6 @@ jobs:
lime rebuild hl -clean -release -nocolor -verbose -nocffi
- uses: actions/upload-artifact@v3
if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe
with:
name: Linux-NDLL
path: |
Expand All @@ -59,7 +55,6 @@ jobs:
if-no-files-found: error

- uses: actions/upload-artifact@v3
if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe
with:
name: Linux64-NDLL
path: |
Expand All @@ -68,7 +63,6 @@ jobs:
if-no-files-found: error

- uses: actions/upload-artifact@v3
if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe
with:
name: Linux64-Hashlink
path: |
Expand Down Expand Up @@ -101,7 +95,7 @@ jobs:
rm /usr/local/bin/python3*
brew bundle
popd
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand Down Expand Up @@ -153,7 +147,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand Down Expand Up @@ -217,8 +211,9 @@ jobs:
with:
ndk-version: r21e

- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
distribution: "zulu"
java-version: 11

- uses: krdlab/setup-haxe@v1
Expand All @@ -231,7 +226,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand Down Expand Up @@ -289,7 +284,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand Down Expand Up @@ -339,7 +334,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
Expand Down Expand Up @@ -424,8 +419,6 @@ jobs:
steps:

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

- uses: krdlab/setup-haxe@v1
with:
Expand Down Expand Up @@ -462,8 +455,9 @@ jobs:
with:
ndk-version: r15c

- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
distribution: "zulu"
java-version: 11

- uses: krdlab/setup-haxe@v1
Expand All @@ -476,7 +470,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
Expand Down Expand Up @@ -554,51 +548,70 @@ jobs:
lime build SimpleImage flash -release -verbose -nocolor
lime build SimpleAudio flash -release -verbose -nocolor
hashlink-samples:
air-samples:
needs: package-haxelib
runs-on: windows-latest
strategy:
matrix:
os: [ubuntu-20.04
, macos-11, windows-latest]
runs-on: ${{ matrix.os }}
haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.1]
steps:

- uses: krdlab/setup-haxe@v1
with:
haxe-version: 4.2.5

- name: Set HAXEPATH (Windows)
if: ${{ startsWith(matrix.os, 'windows-') }}
- uses: joshtynjala/setup-adobe-air-action@v2
with:
air-version: "33.1"
accept-license: true

- name: Set HAXEPATH
run: |
echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV
- name: Set HAXEPATH (macOS/Linux)
if: ${{ !startsWith(matrix.os, 'windows-') }}
- name: Install Haxe dependencies
run: |
echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
- uses: actions/download-artifact@v3
with:
name: lime-haxelib
path: lime-haxelib

- name: Install system dependencies (Linux)
if: ${{ startsWith(matrix.os, 'ubuntu-') }}
- name: Prepare lime
run: |
sudo apt-get update
sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev
haxelib dev lime lime-haxelib
haxelib run lime setup -alias -y -nocffi
haxelib run lime config AIR_SDK ${{ env.AIR_HOME }}
- name: Install Haxe dependencies
- name: Create Lime samples
run: |
haxelib install hxcpp --quiet
haxelib install format --quiet
haxelib install hxp --quiet
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
lime create HelloWorld -verbose -nocolor
lime create SimpleImage -verbose -nocolor
lime create SimpleAudio -verbose -nocolor
- name: Enable HXCPP compile cache (Windows)
if: ${{ startsWith(matrix.os, 'windows-') }}
- name: Build Lime samples
run: |
echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $Env:GITHUB_ENV
lime build HelloWorld air -release -verbose -nocolor
lime build SimpleImage air -release -verbose -nocolor
lime build SimpleAudio air -release -verbose -nocolor
- name: Enable HXCPP compile cache (macOS/Linux)
if: ${{ !startsWith(matrix.os, 'windows-') }}
hashlink-samples:
needs: package-haxelib
runs-on: ubuntu-20.04
steps:

- uses: krdlab/setup-haxe@v1
with:
haxe-version: 4.2.5

- name: Set HAXEPATH
run: |
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV
- name: Install Haxe dependencies
run: |
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
- uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -637,6 +650,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install genes --quiet
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
- uses: actions/download-artifact@v3
Expand All @@ -661,6 +675,18 @@ jobs:
lime build SimpleImage html5 -release -verbose -nocolor
lime build SimpleAudio html5 -release -verbose -nocolor
- name: Build Lime samples with Genes
run: |
lime build HelloWorld html5 -clean -release -verbose -nocolor --haxelib=genes
lime build SimpleImage html5 -clean -release -verbose -nocolor --haxelib=genes
lime build SimpleAudio html5 -clean -release -verbose -nocolor --haxelib=genes
- name: Build Lime samples with Terser minification
run: |
lime build HelloWorld html5 -clean -release -verbose -nocolor -minify -terser
lime build SimpleImage html5 -clean -release -verbose -nocolor -minify -terser
lime build SimpleAudio html5 -clean -release -verbose -nocolor -minify -terser
ios-samples:
needs: package-haxelib
runs-on: macos-11
Expand All @@ -676,7 +702,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
Expand Down Expand Up @@ -727,7 +753,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
Expand Down Expand Up @@ -773,7 +799,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
Expand Down Expand Up @@ -806,49 +832,24 @@ jobs:
neko-samples:
needs: package-haxelib
runs-on: ubuntu-20.04
strategy:
matrix:
os: [ubuntu-20.04, macos-11, windows-latest]
runs-on: ${{ matrix.os }}
haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.1]
steps:

- uses: krdlab/setup-haxe@v1
with:
haxe-version: 4.2.5

- name: Set HAXEPATH (Windows)
if: ${{ startsWith(matrix.os, 'windows-') }}
run: |
echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV
haxe-version: ${{ matrix.haxe-version }}

- name: Set HAXEPATH (macOS/Linux)
if: ${{ !startsWith(matrix.os, 'windows-') }}
- name: Set HAXEPATH
run: |
echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV
- name: Install system dependencies (Linux)
if: ${{ startsWith(matrix.os, 'ubuntu-') }}
run: |
sudo apt-get update
sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install format --quiet
haxelib install hxp --quiet
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
- name: Enable HXCPP compile cache (Windows)
if: ${{ startsWith(matrix.os, 'windows-') }}
run: |
echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $Env:GITHUB_ENV
- name: Enable HXCPP compile cache (macOS/Linux)
if: ${{ !startsWith(matrix.os, 'windows-') }}
run: |
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
- uses: actions/download-artifact@v3
with:
name: lime-haxelib
Expand Down Expand Up @@ -886,7 +887,7 @@ jobs:
- name: Install Haxe dependencies
run: |
haxelib install hxcpp --quiet
haxelib install hxcpp 4.2.1 --quiet
haxelib install format --quiet
haxelib install hxp --quiet
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
Expand Down Expand Up @@ -919,7 +920,7 @@ jobs:
notify:
runs-on: ubuntu-20.04
needs: [package-haxelib, docs, android-samples, flash-samples, hashlink-samples, html5-samples, ios-samples, linux-samples, macos-samples, neko-samples, windows-samples]
needs: [package-haxelib, docs, android-samples, flash-samples, air-samples, hashlink-samples, html5-samples, ios-samples, linux-samples, macos-samples, neko-samples, windows-samples]
if: ${{ github.repository == 'openfl/lime' && github.event_name != 'pull_request' }}
steps:
- name: Notify Discord
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
shallow = true
[submodule "project/lib/cairo"]
path = project/lib/cairo
url = https://github.com/freedesktop/cairo
url = https://gitlab.freedesktop.org/cairo/cairo.git
shallow = true
[submodule "project/lib/pixman"]
path = project/lib/pixman
url = https://github.com/freedesktop/pixman
url = https://gitlab.freedesktop.org/pixman/pixman.git
shallow = true
[submodule "project/lib/lzma"]
path = project/lib/lzma
Expand Down
Loading

0 comments on commit 35d6050

Please sign in to comment.