Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 15 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,30 @@ jobs:
fail-fast: false
matrix:
os: [linux, macos, macos-arm64]
lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, luajit=2.0, luajit=2.1]
lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, lua=5.5, luajit=2.0, luajit=2.1]
include:
- os: linux
runner: ubuntu-22.04
runner: ubuntu-latest
- os: macos
runner: macos-13
runner: macos-15-intel
- os: macos-arm64
runner: macos-14
runner: macos-latest
exclude:
- os: macos-arm64
lua: luajit=2.0
name: ${{ matrix.os }} (${{ matrix.lua }})
runs-on: ${{ matrix.runner }}
steps:
# Checks-out the repository under $GITHUB_WORKSPACE.
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Install libreadline
if: runner.os == 'Linux'
run: |
sudo apt-get install -y libreadline-dev

- name: Install Lua (${{ matrix.lua }})
run: |
pip install hererocks
pip install git+https://github.com/luarocks/hererocks
hererocks lua_install -r^ --${{ matrix.lua }}
env:
MACOSX_DEPLOYMENT_TARGET: 11.0
Expand All @@ -45,16 +50,16 @@ jobs:
strategy:
fail-fast: false
matrix:
lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, luajit=2.0, luajit=2.1]
lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, lua=5.5, luajit=2.0, luajit=2.1]
target: [mingw,vs]
runs-on: windows-2022
steps:
# Checks-out the repository under $GITHUB_WORKSPACE.
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Install Lua (${{ matrix.lua }})
run: |
pip install hererocks
hererocks lua_install -r@28f9d98 --${{ matrix.lua }} --target ${{ matrix.target }}
pip install git+https://github.com/luarocks/hererocks
hererocks lua_install -r^ --${{ matrix.lua }} --target ${{ matrix.target }}
- name: Build lua-simdjson
run: |
.\lua_install\bin\activate
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OBJ = src/hxluasimdjson.o src/simdjson.o
CPPFLAGS = -I$(LUA_INCDIR)
CXXFLAGS = -std=c++11 -Wall $(CFLAGS)
CXXFLAGS = -std=c++11 -Wall -fvisibility=hidden $(CFLAGS)
LDFLAGS = $(LIBFLAG)
LDLIBS = -lpthread

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package="hx-lua-simdjson"
version="0.0.7-1"
version="0.0.9-1"
source = {
url = "git://github.com/HaxeFoundation/hx-lua-simdjson",
tag = "0.0.7"
tag = "0.0.9"
}
description = {
summary = "This is a simple Haxe-specific Lua binding for simdjson",
Expand All @@ -13,7 +13,7 @@ description = {
license = "Apache-2.0"
}
dependencies = {
"lua >= 5.1, < 5.5"
"lua >= 5.1, < 5.6"
}
build = {
type = "make",
Expand Down
2 changes: 1 addition & 1 deletion hx-lua-simdjson-scm-1.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description = {
license = "Apache-2.0"
}
dependencies = {
"lua >= 5.1, < 5.5"
"lua >= 5.1, < 5.6"
}
build = {
type = "make",
Expand Down
1 change: 1 addition & 0 deletions jsonexamples/invalid/unknown_type.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ -Inf }
Loading