Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[lua] Remove haxe-deps and directly reference dependencies; re-enable CI #10916

Merged
merged 16 commits into from
Jan 4, 2023
Merged

[lua] Remove haxe-deps and directly reference dependencies; re-enable CI #10916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f20d740
Update JsonParser.hx
inklit Jan 2, 2023
d7b6909
fix typo
inklit Jan 2, 2023
7b496fc
Merge pull request #1 from inklit/asdf
inklit Jan 2, 2023
5b655ad
Merge branch 'HaxeFoundation:development' into development
inklit Jan 3, 2023
71cc15a
Update Lua.hx
inklit Jan 3, 2023
f093428
Update Earthfile
inklit Jan 3, 2023
f2e090e
Update main.yml
inklit Jan 3, 2023
37904ba
Update Lua.hx
inklit Jan 3, 2023
4290459
Update main.yml
inklit Jan 3, 2023
5dbd13b
Update main.yml
inklit Jan 3, 2023
e6149de
Update Lua.hx
inklit Jan 3, 2023
bbc63d6
Update Lua.hx
inklit Jan 3, 2023
eb775b3
Update Issue10752.hx
inklit Jan 4, 2023
9e620b6
Update Lua.hx
inklit Jan 4, 2023
183fca5
Update Lua.hx
inklit Jan 4, 2023
dc8133a
Update Lua.hx
inklit Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,14 +345,14 @@ jobs:
fail-fast: false
matrix:
# TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/5024
kLabz marked this conversation as resolved.
Show resolved Hide resolved
target: [macro, js, hl, cpp, 'java,jvm', cs, php, python, neko]
target: [macro, js, hl, cpp, 'java,jvm', cs, php, python, lua, neko]
include:
- target: hl
APT_PACKAGES: cmake ninja-build libturbojpeg-dev
- target: cpp
APT_PACKAGES: gcc-multilib g++-multilib
# - target: lua
# APT_PACKAGES: ncurses-dev
- target: lua
APT_PACKAGES: ncurses-dev
steps:
- uses: actions/checkout@main
with:
Expand Down
2 changes: 1 addition & 1 deletion Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ test-all:
BUILD +test-jvm
BUILD +test-cs
BUILD +test-cpp
# BUILD +test-lua
BUILD +test-lua
BUILD +test-js
BUILD +test-flash

Expand Down
10 changes: 5 additions & 5 deletions extra/github-actions/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,14 @@ jobs:
fail-fast: false
matrix:
# TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/5024
target: [macro, js, hl, cpp, 'java,jvm', cs, php, python, neko]
target: [macro, js, hl, cpp, 'java,jvm', cs, php, python, lua, neko]
include:
- target: hl
APT_PACKAGES: cmake ninja-build libturbojpeg-dev
- target: cpp
APT_PACKAGES: gcc-multilib g++-multilib
# - target: lua
# APT_PACKAGES: ncurses-dev
- target: lua
APT_PACKAGES: ncurses-dev
steps:
- uses: actions/checkout@main
with:
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
fail-fast: false
matrix:
# TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/5024
target: [macro, js, hl, cpp, 'java,jvm', cs, php, python, flash9, neko]
target: [macro, js, hl, cpp, 'java,jvm', cs, php, python, lua, flash9, neko]
steps:
- uses: actions/checkout@main
with:
Expand All @@ -318,7 +318,7 @@ jobs:
matrix:
# TODO jvm: https://github.com/HaxeFoundation/haxe/issues/8601
# TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/5024
target: [macro, js, hl, cpp, java, cs, php, python, neko]
target: [macro, js, hl, cpp, java, cs, php, python, lua, neko]
steps:
- uses: actions/checkout@main
with:
Expand Down
13 changes: 12 additions & 1 deletion tests/runci/targets/Lua.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,20 @@ class Lua {
// Note: don't use a user config
// attemptCommand("luarocks", ["config", "--user-config"]);

installLib("haxe-deps", "0.0.1-6");
installLib("luasec", "1.0.2-1");

installLib("lrexlib-pcre", "2.9.1-1");
installLib("luv", "1.36.0-0");
installLib("luasocket", "3.0rc1-2");
installLib("luautf8", "0.1.1-1");

//Install bit32 for lua 5.1
if(lv == "-l5.1"){
installLib("bit32", "5.2.2-1");
}

installLib("hx-lua-simdjson", "0.0.1-1");

changeDirectory(unitDir);
runCommand("haxe", ["compile-lua.hxml"].concat(args));
runCommand("lua", ["bin/unit.lua"]);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/src/unit/issues/Issue10752.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Issue10752 extends Test {
function shl(x, y)
return x << y;

#if (!php && !python)
#if (!php && !python && !lua)
function test() {
eq(2, shl(1, 33));
eq(2, 1 << 33);
Expand Down