Skip to content

Commit 8e49fba

Browse files
authored
Merge pull request #332 from luau-project/fix-ubuntu-ci
fix: install libreadline-dev on CI
2 parents d7666f7 + f8b41b4 commit 8e49fba

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ on:
66
pull_request:
77
branches: [ master ]
88

9+
env:
10+
# Force software rendering on CI, because
11+
# we were getting a CI error on Ubuntu 24.04 as follows:
12+
# MESA: error: ZINK: vkCreateInstance failed (VK_ERROR_INCOMPATIBLE_DRIVER))
13+
# For more information, see https://github.com/lgi-devs/lgi/pull/332
14+
LIBGL_ALWAYS_SOFTWARE: 1
15+
916
jobs:
1017
build_puc:
1118
name: Test on PUC-Rio Lua
@@ -15,18 +22,19 @@ jobs:
1522
matrix:
1623
version: [5.1.5, 5.2.4, 5.3.6, 5.4.7]
1724

25+
env:
26+
LUA_VERSION: ${{ matrix.version }}
27+
1828
steps:
29+
- name: Install Lua dependencies
30+
run: sudo apt install -y libreadline-dev
1931
- name: Build PUC-Rio Lua ${{ matrix.version }}
20-
env:
21-
LUA_VERSION: ${{ matrix.version }}
2232
run: |
2333
wget "https://www.lua.org/ftp/lua-${LUA_VERSION}.tar.gz"
2434
tar xzvf "lua-${LUA_VERSION}.tar.gz"
2535
cd "lua-${LUA_VERSION}"
26-
make linux SYSLIBS="-Wl,-E -ldl -lreadline" SYSCFLAGS="-DLUA_USE_LINUX -ULUA_COMPAT_5_2 -DLUA_USE_APICHECK" CC='gcc -g'
36+
make linux SYSLIBS="-Wl,-E -ldl -lreadline" SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_APICHECK" CC='gcc -g'
2737
- name: Install PUC-Rio Lua ${{ matrix.version }}
28-
env:
29-
LUA_VERSION: ${{ matrix.version }}
3038
run: |
3139
cd "lua-${LUA_VERSION}"
3240
sudo make install
@@ -46,7 +54,6 @@ jobs:
4654
xvfb-run -a sh -c 'LD_PRELOAD="${sanitizers}" make check'
4755
- name: Check that make install works
4856
env:
49-
LUA_VERSION: ${{ matrix.version }}
5057
LSAN_OPTIONS: suppressions=${{ github.workspace }}/.github/lsan.supp
5158
UBSAN_OPTIONS: print_stacktrace=1:report_error_type=1:halt_on_error=1:suppressions=${{ github.workspace }}/.github/ubsan.supp
5259
run: |

.github/workflows/msvc-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
env:
2828
WINGTK_URL: https://github.com/wingtk/gvsbuild/releases/download/2024.10.0/GTK${{ matrix.gtk-major-version }}_Gvsbuild_2024.10.0_x64.zip
29-
LUAINSTALLER_URL: https://github.com/luau-project/LuaInstaller/releases/download/v0.3.0.0/LuaInstaller.Console-v0.3.0.0-x64.zip
29+
LUAINSTALLER_URL: https://github.com/luau-project/LuaInstaller/releases/download/v0.5.0.0/LuaInstaller.Console-v0.5.0.0-x64.zip
3030

3131
steps:
3232

0 commit comments

Comments
 (0)