From 16366e04deec23c0578e7a43c83145469ac030fe Mon Sep 17 00:00:00 2001 From: Tobi Laskowski Date: Thu, 11 Jan 2024 17:10:03 +0000 Subject: [PATCH 1/3] Use git versions of ufront libraries These include haxe 4 fixes --- libs.hxml | 14 +++++++------- server_each.hxml | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libs.hxml b/libs.hxml index ef9ca5b34..e36e6cf5b 100644 --- a/libs.hxml +++ b/libs.hxml @@ -1,6 +1,6 @@ --cmd curl -sSLk https://lib.haxe.org/files/3.0/tink_core-1,23,0.zip -o haxelib_global/tink_core.zip && neko run.n install --always --skip-dependencies haxelib_global/tink_core.zip --cmd curl -sSLk https://lib.haxe.org/files/3.0/tink_core-1,0,0-rc,11.zip -o haxelib_global/tink_core.zip && neko run.n install --always --skip-dependencies haxelib_global/tink_core.zip --cmd curl -sSLk https://lib.haxe.org/files/3.0/tink_macro-0,6,4.zip -o haxelib_global/tink_macro.zip && neko run.n install --always --skip-dependencies haxelib_global/tink_macro.zip +-cmd curl -sSLk https://lib.haxe.org/files/3.0/tink_core-2,1,1.zip -o haxelib_global/tink_core.zip && neko run.n install --always --skip-dependencies haxelib_global/tink_core.zip +# -cmd curl -sSLk https://lib.haxe.org/files/3.0/tink_core-1,0,0-rc,11.zip -o haxelib_global/tink_core.zip && neko run.n install --always --skip-dependencies haxelib_global/tink_core.zip +-cmd curl -sSLk https://lib.haxe.org/files/3.0/tink_macro-1,0,0.zip -o haxelib_global/tink_macro.zip && neko run.n install --always --skip-dependencies haxelib_global/tink_macro.zip -cmd curl -sSLk https://lib.haxe.org/files/3.0/promhx-1,1,0.zip -o haxelib_global/promhx.zip && neko run.n install --always --skip-dependencies haxelib_global/promhx.zip -cmd curl -sSLk https://lib.haxe.org/files/3.0/asynctools-0,1,0.zip -o haxelib_global/asynctools.zip && neko run.n install --always --skip-dependencies haxelib_global/asynctools.zip -cmd curl -sSLk https://lib.haxe.org/files/3.0/buddy-2,8,1.zip -o haxelib_global/buddy.zip && neko run.n install --always --skip-dependencies haxelib_global/buddy.zip @@ -20,11 +20,11 @@ -cmd curl -sSLk https://lib.haxe.org/files/3.0/mtwin-1,6,0.zip -o haxelib_global/mtwin.zip && neko run.n install --always --skip-dependencies haxelib_global/mtwin.zip -cmd curl -sSLk https://lib.haxe.org/files/3.0/PBKDF2-1,0,0.zip -o haxelib_global/PBKDF2.zip && neko run.n install --always --skip-dependencies haxelib_global/PBKDF2.zip -cmd curl -sSLk https://lib.haxe.org/files/3.0/tora-1,8,1.zip -o haxelib_global/tora.zip && neko run.n install --always --skip-dependencies haxelib_global/tora.zip --cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-mvc-1,1,0.zip -o haxelib_global/ufront-mvc.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-mvc.zip +-cmd git clone https://github.com/ufront/ufront-mvc haxelib_global/ufront-mvc --depth=1 --single-branch && neko run.n dev ufront-mvc haxelib_global/ufront-mvc +-cmd git clone https://github.com/ufront/ufront-ufadmin haxelib_global/ufront-ufadmin --depth=1 --single-branch && neko run.n dev ufront-ufadmin haxelib_global/ufront-ufadmin +-cmd git clone https://github.com/ufront/ufront-easyauth haxelib_global/ufront-easyauth --depth=1 --single-branch && neko run.n dev ufront-easyauth haxelib_global/ufront-easyauth +-cmd git clone https://github.com/ufront/ufront-mail haxelib_global/ufront-mail --depth=1 --single-branch && neko run.n dev ufront-mail haxelib_global/ufront-mail -cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-orm-1,1,0.zip -o haxelib_global/ufront-orm.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-orm.zip --cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-easyauth-1,0,0.zip -o haxelib_global/ufront-easyauth.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-easyauth.zip --cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-mail-1,0,0-rc,4.zip -o haxelib_global/ufront-mail.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-mail.zip --cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-ufadmin-1,0,0-beta,14.zip -o haxelib_global/ufront-ufadmin.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-ufadmin.zip -cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-uftasks-1,0,0-beta,15.zip -o haxelib_global/ufront-uftasks.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront-uftasks.zip -cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-2,0,0.zip -o haxelib_global/ufront.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront.zip -cmd curl -sSLk https://lib.haxe.org/files/3.0/utest-1,9,6.zip -o haxelib_global/utest.zip && neko run.n install --always --skip-dependencies haxelib_global/utest.zip diff --git a/server_each.hxml b/server_each.hxml index aac315465..c198e0f8e 100644 --- a/server_each.hxml +++ b/server_each.hxml @@ -2,6 +2,7 @@ -cp hx3compat/std -cp hx4compat/std -cp crypto/src +-lib tink_macro -lib ufront -lib ufront-mail:1.0.0-rc.4 -lib ufront-ufadmin From a6d2dee2dc92e81842f76d43a1494370012a04cb Mon Sep 17 00:00:00 2001 From: Tobi Laskowski Date: Thu, 11 Jan 2024 17:10:18 +0000 Subject: [PATCH 2/3] Update record macros with haxe 4.3 fix --- lib/record-macros | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/record-macros b/lib/record-macros index aa7703f18..00afa3924 160000 --- a/lib/record-macros +++ b/lib/record-macros @@ -1 +1 @@ -Subproject commit aa7703f18cf5ec5af584e237fb333b4d567c478a +Subproject commit 00afa3924e8478203dd500f8b8a6f2174b2f8e13 From d0be23913c52bac277d7fa4af1d7be9de2fbd590 Mon Sep 17 00:00:00 2001 From: Tobi Laskowski Date: Fri, 12 Apr 2024 11:48:00 +0100 Subject: [PATCH 3/3] Build server on haxe 4 --- Earthfile | 2 +- server_api.hxml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 33eaa6950..a10add4be 100644 --- a/Earthfile +++ b/Earthfile @@ -335,7 +335,7 @@ aws-ndll: SAVE ARTIFACT /workspace/haxelib_global/aws-sdk-neko/*/ndll/Linux64/aws.ndll haxelib-server-builder: - FROM haxe:3.4 + FROM haxe:4.3 WORKDIR /workspace COPY lib/record-macros lib/record-macros diff --git a/server_api.hxml b/server_api.hxml index bcaedbe8c..452b67e6d 100644 --- a/server_api.hxml +++ b/server_api.hxml @@ -3,5 +3,7 @@ -main haxelib.server.Repo -lib aws-sdk-neko -lib record-macros +-cp hx3compat/std +-cp hx4compat/std -dce no -D haxelib_api