Skip to content

Commit 22cadeb

Browse files
committed
Merge remote-tracking branch 'upstream' into hx-0.0.9
2 parents aef9ffb + d91c82c commit 22cadeb

9 files changed

Lines changed: 63411 additions & 29968 deletions

File tree

.github/workflows/ci.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,30 @@ jobs:
88
fail-fast: false
99
matrix:
1010
os: [linux, macos, macos-arm64]
11-
lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, luajit=2.0, luajit=2.1]
11+
lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, lua=5.5, luajit=2.0, luajit=2.1]
1212
include:
1313
- os: linux
14-
runner: ubuntu-22.04
14+
runner: ubuntu-latest
1515
- os: macos
16-
runner: macos-13
16+
runner: macos-15-intel
1717
- os: macos-arm64
18-
runner: macos-14
18+
runner: macos-latest
1919
exclude:
2020
- os: macos-arm64
2121
lua: luajit=2.0
2222
name: ${{ matrix.os }} (${{ matrix.lua }})
2323
runs-on: ${{ matrix.runner }}
2424
steps:
2525
# Checks-out the repository under $GITHUB_WORKSPACE.
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v6
27+
- name: Install libreadline
28+
if: runner.os == 'Linux'
29+
run: |
30+
sudo apt-get install -y libreadline-dev
31+
2732
- name: Install Lua (${{ matrix.lua }})
2833
run: |
29-
pip install hererocks
34+
pip install git+https://github.com/luarocks/hererocks
3035
hererocks lua_install -r^ --${{ matrix.lua }}
3136
env:
3237
MACOSX_DEPLOYMENT_TARGET: 11.0
@@ -45,16 +50,16 @@ jobs:
4550
strategy:
4651
fail-fast: false
4752
matrix:
48-
lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, luajit=2.0, luajit=2.1]
53+
lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, lua=5.5, luajit=2.0, luajit=2.1]
4954
target: [mingw,vs]
5055
runs-on: windows-2022
5156
steps:
5257
# Checks-out the repository under $GITHUB_WORKSPACE.
53-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v6
5459
- name: Install Lua (${{ matrix.lua }})
5560
run: |
56-
pip install hererocks
57-
hererocks lua_install -r@28f9d98 --${{ matrix.lua }} --target ${{ matrix.target }}
61+
pip install git+https://github.com/luarocks/hererocks
62+
hererocks lua_install -r^ --${{ matrix.lua }} --target ${{ matrix.target }}
5863
- name: Build lua-simdjson
5964
run: |
6065
.\lua_install\bin\activate

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
OBJ = src/hxluasimdjson.o src/simdjson.o
22
CPPFLAGS = -I$(LUA_INCDIR)
3-
CXXFLAGS = -std=c++11 -Wall $(CFLAGS)
3+
CXXFLAGS = -std=c++11 -Wall -fvisibility=hidden $(CFLAGS)
44
LDFLAGS = $(LIBFLAG)
55
LDLIBS = -lpthread
66

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package="hx-lua-simdjson"
2-
version="0.0.7-1"
2+
version="0.0.9-1"
33
source = {
44
url = "git://github.com/HaxeFoundation/hx-lua-simdjson",
5-
tag = "0.0.7"
5+
tag = "0.0.9"
66
}
77
description = {
88
summary = "This is a simple Haxe-specific Lua binding for simdjson",
@@ -13,7 +13,7 @@ description = {
1313
license = "Apache-2.0"
1414
}
1515
dependencies = {
16-
"lua >= 5.1, < 5.5"
16+
"lua >= 5.1, < 5.6"
1717
}
1818
build = {
1919
type = "make",

hx-lua-simdjson-scm-1.rockspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ description = {
1212
license = "Apache-2.0"
1313
}
1414
dependencies = {
15-
"lua >= 5.1, < 5.5"
15+
"lua >= 5.1, < 5.6"
1616
}
1717
build = {
1818
type = "make",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ -Inf }

0 commit comments

Comments
 (0)