diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 567d8171a6d..caed94c89c3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,23 +2,31 @@ name: Build
on:
push:
- branches: [ main, experimental ]
+ branches:
+ - main
+ - experimental
pull_request:
- branches: [ main, experimental ]
+ branches:
+ - main
+ - experimental
workflow_dispatch:
jobs:
buildLinux:
+ name: Build Linux
runs-on: ubuntu-latest
-
+
steps:
- - uses: actions/checkout@v4.3.0
+ - name: Checkout repository
+ uses: actions/checkout@v7
- - uses: krdlab/setup-haxe@master
+ - name: Setup Haxe
+ uses: krdlab/setup-haxe@master
with:
haxe-version: 4.3.7
- - name: Restore Build cache
- uses: actions/cache@v4
+
+ - name: Restore Build Cache
+ uses: actions/cache@v6
with:
key: cacheLinux
path: |
@@ -26,6 +34,7 @@ jobs:
export/release/linux/obj/
restore-keys: |
cacheLinux
+
- name: Install Haxelib
run: |
sudo apt-get install libvlc-dev
@@ -34,26 +43,34 @@ jobs:
haxelib install hxcpp > /dev/null --quiet
chmod +x ./setup/unix.sh
sh ./setup/unix.sh
- - name: Create Version Tag
- run: echo "${{github.run_id}}" > VERSION
+
+ - name: Create version tag
+ run: echo "${{ github.run_id }}" > VERSION
+
- name: Compile
- run: haxelib run lime build Project.xml linux --app-version="4.0.0-${{ github.run_id}}" -D officialBuild
- - name: Publish Artifact
- uses: actions/upload-artifact@v4
+ run: haxelib run lime build Project.xml linux --app-version="4.0.0-${{ github.run_id }}" -D officialBuild
+
+ - name: Publish artifact
+ uses: actions/upload-artifact@v7
with:
name: linuxBuild
path: export/release/linux/bin
+
buildWindows:
+ name: Build Windows
runs-on: windows-latest
steps:
- - uses: actions/checkout@v4.3.0
+ - name: Checkout repository
+ uses: actions/checkout@v7
- - uses: krdlab/setup-haxe@master
+ - name: Setup Haxe
+ uses: krdlab/setup-haxe@master
with:
haxe-version: 4.3.7
- - name: Restore Build cache
- uses: actions/cache@v4
+
+ - name: Restore Build Cache
+ uses: actions/cache@v6
with:
key: cacheWindows
path: |
@@ -61,32 +78,41 @@ jobs:
export/release/windows/obj/
restore-keys: |
cacheWindows
+
- name: Install Haxelib
run: |
haxelib setup C:/haxelib
haxelib install hxcpp > /dev/null --quiet
.\"setup/windows.bat"
shell: cmd
- - name: Create Version Tag
- run: echo "${{github.run_id}}" > VERSION
+
+ - name: Create version tag
+ run: echo "${{ github.run_id }}" > VERSION
+
- name: Compile
- run: haxelib run lime build windows --app-version="4.0.0-${{ github.run_id}}" -D officialBuild
- - name: Publish Artifact
- uses: actions/upload-artifact@v4
+ run: haxelib run lime build windows --app-version="4.0.0-${{ github.run_id }}" -D officialBuild
+
+ - name: Publish artifact
+ uses: actions/upload-artifact@v7
with:
name: windowsBuild
path: export/release/windows/bin
+
buildMac:
- runs-on: macos-15
+ name: Build macOS
+ runs-on: macos-latest
steps:
- - uses: actions/checkout@v4.3.0
+ - name: Checkout
+ uses: actions/checkout@v7
- - uses: krdlab/setup-haxe@master
+ - name: Setup Haxe
+ uses: krdlab/setup-haxe@master
with:
haxe-version: 4.3.7
- - name: Restore Build cache
- uses: actions/cache@v4
+
+ - name: Restore Build Cache
+ uses: actions/cache@v6
with:
key: cacheMac
path: |
@@ -94,18 +120,22 @@ jobs:
export/release/macos/obj/
restore-keys: |
cacheMac
+
- name: Install Haxelib
run: |
haxelib setup ~/haxelib
haxelib install hxcpp > /dev/null --quiet
chmod +x ./setup/unix.sh
sh ./setup/unix.sh
- - name: Create Version Tag
- run: echo "${{github.run_id}}" > VERSION
+
+ - name: Create version tag
+ run: echo "${{ github.run_id }}" > VERSION
+
- name: Compile
- run: haxelib run lime build mac --app-version="4.0.0-${{ github.run_id}}" -D officialBuild
- - name: Publish Artifact
- uses: actions/upload-artifact@v4
+ run: haxelib run lime build mac --app-version="4.0.0-${{ github.run_id }}" -D officialBuild
+
+ - name: Publish artifact
+ uses: actions/upload-artifact@v7
with:
name: macBuild
path: export/release/macos/bin
diff --git a/Project.xml b/Project.xml
index 57aa1bdc105..616773d0262 100644
--- a/Project.xml
+++ b/Project.xml
@@ -150,14 +150,8 @@
-
-
-
-
-
-
diff --git a/setup/unix.sh b/setup/unix.sh
index 84fe7c171b1..1ba46d901ce 100755
--- a/setup/unix.sh
+++ b/setup/unix.sh
@@ -11,13 +11,12 @@ haxelib install lime
haxelib install openfl
haxelib install flixel
haxelib install flixel-addons
-haxelib install flixel-tools
haxelib install tjson
haxelib install hxdiscord_rpc
haxelib install hxvlc --skip-dependencies
-haxelib git hscript-iris https://github.com/pisayesiwsi/hscript-iris.git dev
-haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate.git dev
+haxelib install hscript-iris
+haxelib install flixel-animate
haxelib git linc_luajit https://github.com/superpowers04/linc_luajit.git
haxelib git funkin.vis https://github.com/FunkinCrew/funkVis.git 1966f8fbbbc509ed90d4b520f3c49c084fc92fd6
-haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git
+haxelib install grig.audio
echo Finished!
diff --git a/setup/windows.bat b/setup/windows.bat
index 706a059ba2f..8ac981b5dff 100644
--- a/setup/windows.bat
+++ b/setup/windows.bat
@@ -8,14 +8,13 @@ haxelib install lime
haxelib install openfl
haxelib install flixel
haxelib install flixel-addons
-haxelib install flixel-tools
haxelib install tjson
haxelib install hxdiscord_rpc
haxelib install hxvlc --skip-dependencies
-haxelib git hscript-iris https://github.com/pisayesiwsi/hscript-iris.git dev
-haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate.git dev
+haxelib install hscript-iris
+haxelib install flixel-animate
haxelib git linc_luajit https://github.com/superpowers04/linc_luajit.git
haxelib git funkin.vis https://github.com/FunkinCrew/funkVis.git 1966f8fbbbc509ed90d4b520f3c49c084fc92fd6
-haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git
+haxelib install grig.audio
echo Finished!
pause