Trying to fix the CI for lua

This commit is contained in:
Zoe Roux
2021-06-16 15:02:09 +02:00
parent 857e9c6d37
commit ec9dacf150
5 changed files with 12 additions and 6 deletions

View File

@@ -9,6 +9,8 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: true
- name: Install lua
run: sudo apt install -y lua-devel
- name: Exec
shell: bash
run: ./build_web.sh

View File

@@ -22,10 +22,16 @@ jobs:
- name: Install Xorg lib
if: matrix.name == 'Linux'
run: |
sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev lua-devel
- name: Update G++
if: matrix.name == 'Linux'
run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
- name: Install Lua
if: matrix.name == 'Windows'
shell: bash
run: |
curl https://sourceforge.net/projects/luabinaries/files/5.4.2/Windows%20Libraries/Dynamic/lua-5.4.2_Win64_dll16_lib.zip/download -L > lua.zip
unzip lua
- name: Build
run: |
mkdir build && cd build

View File

@@ -12,7 +12,7 @@ jobs:
submodules: true
- name: Install Xorg lib
run: |
sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
sudo apt install -y libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev lua-devel
- name: Update G++
run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
- name: Build

View File

@@ -3,8 +3,6 @@ project(bomberman)
set(CMAKE_CXX_STANDARD 20)
cmake_minimum_required(VERSION 3.10)
include_directories(bomberman lib/Ray/sources)
include_directories(bomberman lib/wal/sources)
include_directories(bomberman lib/LuaGate/sources)
@@ -157,7 +155,7 @@ target_link_libraries(bomberman PUBLIC wal ray ${LUA_LIBRARIES} LuaGate)
add_executable(unit_tests EXCLUDE_FROM_ALL
${SOURCES}
tests/CacheTest.cpp
tests/CacheTest.cpp
tests/EntityTests.cpp
tests/MainTest.cpp
tests/EngineTests.cpp

View File

@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.11)
cmake_minimum_required(VERSION 3.11)
set(CMAKE_CXX_STANDARD 20)
set(LIB_NAME "LuaGate")