Skip to content

Commit d0c3420

Browse files
Update CI (#104)
* Update ci.yml * Upgrade checkout action and add libreadline installation Updated GitHub Actions workflow to use checkout@v6 and added installation of libreadline on Linux. * Update Makefile * Update hererocks installation command in CI workflow
1 parent 4dd7f45 commit d0c3420

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,29 @@ jobs:
1111
lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, 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 on linux
28+
run: |
29+
if [ "$RUNNER_OS" == "Linux" ]; then
30+
sudo apt-get install -y libreadline-dev
31+
fi
32+
shell: bash
33+
2734
- name: Install Lua (${{ matrix.lua }})
2835
run: |
29-
pip install hererocks
36+
pip install git+https://github.com/luarocks/hererocks
3037
hererocks lua_install -r^ --${{ matrix.lua }}
3138
env:
3239
MACOSX_DEPLOYMENT_TARGET: 11.0
@@ -50,11 +57,11 @@ jobs:
5057
runs-on: windows-2022
5158
steps:
5259
# Checks-out the repository under $GITHUB_WORKSPACE.
53-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v6
5461
- name: Install Lua (${{ matrix.lua }})
5562
run: |
56-
pip install hererocks
57-
hererocks lua_install -r@28f9d98 --${{ matrix.lua }} --target ${{ matrix.target }}
63+
pip install git+https://github.com/luarocks/hererocks
64+
hererocks lua_install -r^ --${{ matrix.lua }} --target ${{ matrix.target }}
5865
- name: Build lua-simdjson
5966
run: |
6067
.\lua_install\bin\activate

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LDFLAGS = $(LIBFLAG)
55
LDLIBS = -lpthread
66

77
ifdef LUA_LIBDIR
8-
LDLIBS += $(LUA_LIBDIR)
8+
LDLIBS += $(LUA_LIBDIR)/$(LUALIB)
99
endif
1010

1111
ifeq ($(OS),Windows_NT)
@@ -38,4 +38,4 @@ clean:
3838
rm -f *.$(LIBEXT) src/*.{o,d}
3939

4040
install: $(TARGET)
41-
cp $(TARGET) $(INST_LIBDIR)
41+
cp $(TARGET) $(INST_LIBDIR)

0 commit comments

Comments
 (0)