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
6 changes: 5 additions & 1 deletion .github/workflows/buildAndTest-FreeBSD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
compiler: ["gcc", "clang"]
lua: ["luajit", "lua54", "lua53", "lua52", "lua51"]
lua: ["luajit", "lua55", "lua54", "lua53", "lua52", "lua51"]
steps:
- uses: "actions/checkout@v6"
- name: "Setup FreeBSD VM"
Expand All @@ -33,6 +33,9 @@ jobs:
sudo pkg install -y cmake git ${{ matrix.lua }} "$C_COMPILER_PACKAGE"
export LUA_BIN_NAME=${{ matrix.lua }}
case ${{ matrix.lua }} in
*lua55*)
bash -x scripts/buildLuaRocks.sh "5.5"
;;
*lua54*)
bash -x scripts/buildLuaRocks.sh "5.4"
;;
Expand All @@ -52,6 +55,7 @@ jobs:
bash -x scripts/buildLuaRocks.sh
;;
esac
${{ matrix.lua }} -v
sudo luarocks
sudo luarocks install luaunit
'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/buildAndTest-Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
strategy:
matrix:
compiler: ["gcc", "clang"]
lua:
[
lua: [
"luajit libluajit-5.1-dev libluajit-5.1-2",
#"liblua5.5-dev lua5.5",
"liblua5.4-dev lua5.4",
"liblua5.3-dev lua5.3",
"liblua5.2-dev lua5.2",
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/buildAndTest-MacOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,20 @@ jobs:
- name: "Install Dependencies"
run: |
brew install ${{ matrix.lua }} luarocks
lua -v

if [[ "${{ matrix.compiler }}" = "gcc" ]]; then
brew install gcc
luarocks config "variables.CMAKE_C_COMPILER" "$(brew --prefix)/bin/gcc-13"
luarocks config "variables.CMAKE_CXX_COMPILER" "$(brew --prefix)/bin/g++-13"
luarocks config "variables.CMAKE_C_COMPILER" "$(brew --prefix)/bin/gcc-16"
luarocks config "variables.CMAKE_CXX_COMPILER" "$(brew --prefix)/bin/g++-16"
fi

luarocks install luaunit
- name: "Build Project"
run: |
if [[ "${{ matrix.compiler }}" = "gcc" ]]; then
export CXX_COMPILER="$(brew --prefix)/bin/g++-13"
export C_COMPILER="$(brew --prefix)/bin/gcc-13"
export CXX_COMPILER="$(brew --prefix)/bin/g++-16"
export C_COMPILER="$(brew --prefix)/bin/gcc-16"
else
export CXX_COMPILER="$(which clang++)"
export C_COMPILER="$(which clang)"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buildAndTest-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
Copy-Item "$(Resolve-Path libs\lua51.lib)" -Destination "$(Resolve-Path LuaJIT\bin)"

LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config "variables.LUA_LIBDIR" "$(Resolve-Path LuaJIT\bin\)"
LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config cmake_generator "Visual Studio 17 2022"
LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config cmake_generator "Visual Studio 18 2026"
} else {
LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config "variables.LUA_LIBDIR" "$(Resolve-Path LuaJIT\bin)"
LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config cmake_generator "Ninja Multi-Config"
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Adapted from https://github.com/xpol/lua-rapidjson/blob/master/CMakeLists.txt

cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
cmake_minimum_required(VERSION 3.6.0 FATAL_ERROR)

set(FALLBACK_VERSION 0.0.1)
set(TOML++ toml++)
Expand Down Expand Up @@ -46,18 +46,18 @@ FetchContent_Declare(

FetchContent_Declare(
${SOL2}
GIT_REPOSITORY "https://github.com/ThePhD/sol2.git"
GIT_REPOSITORY "https://github.com/halx99/sol2.git"
GIT_SHALLOW ON
GIT_SUBMODULES ""
GIT_TAG "v3.5.0"
GIT_TAG "16a9fabb7ae525d644d3343f15b1de39c8865ecd"
)

FetchContent_Declare(
${MAGIC_ENUM}
GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git"
GIT_SHALLOW ON
GIT_SUBMODULES ""
GIT_TAG "v0.9.7"
GIT_TAG "v0.9.8"
)

FetchContent_GetProperties(${TOML++})
Expand Down
Loading
Loading