Skip to content

Commit 88d3afe

Browse files
committed
use the newer setup-lua version
1 parent 3047f52 commit 88d3afe

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ jobs:
378378
Add-Content "${{ github.path }}" "${install_prefix_bin}";
379379
380380
- name: Setup Lua
381-
uses: luau-project/setup-lua@48961279fba711f39fa539a4903b1ac66153b694 # v1.0.0
381+
uses: luau-project/setup-lua@33cb647d06c5598719d6775b7d9ffa4211a351bd # v1.0.2
382382
with:
383383
lua-version: ${{ matrix.lua-version }}
384384
luarocks-version: none
@@ -458,7 +458,7 @@ jobs:
458458
else
459459
{
460460
$lua_lib = Get-ChildItem "${lua_dir}" -Recurse -File |
461-
Where-Object Extension -EQ ".lib" |
461+
Where-Object Name -Match "lua\d+\.lib" |
462462
Select-Object -ExpandProperty Name -First 1;
463463
464464
if ($lua_lib -eq $null -or $lua_lib -eq "")
@@ -587,7 +587,7 @@ jobs:
587587
# to test the behavior of lua-xz
588588
# on huge files.
589589
LINUX_KERNEL_MAJOR_VERSION: 6
590-
LINUX_KERNEL_MINOR_VERSION: 14
590+
LINUX_KERNEL_MINOR_VERSION: 17
591591

592592
steps:
593593

@@ -724,7 +724,7 @@ jobs:
724724
Add-Content "${{ github.env }}" "LINUX_KERNEL_TAR_XZ=${tarxz_file}";
725725
726726
- name: Setup Lua
727-
uses: luau-project/setup-lua@48961279fba711f39fa539a4903b1ac66153b694 # v1.0.0
727+
uses: luau-project/setup-lua@33cb647d06c5598719d6775b7d9ffa4211a351bd # v1.0.2
728728
with:
729729
lua-version: ${{ matrix.lua-version }}
730730

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
ref: ${{ github.ref }}
3838

3939
- name: Setup Lua
40-
uses: luau-project/setup-lua@48961279fba711f39fa539a4903b1ac66153b694 # v1.0.0
40+
uses: luau-project/setup-lua@33cb647d06c5598719d6775b7d9ffa4211a351bd # v1.0.2
4141

4242
- name: Make sure that tags from GitHub and rockspec are equal
4343
run: |

Makefile.mingw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ SHARED_DEFINES = -DNDEBUG -D_NDEBUG -DLUA_XZ_BUILD_SHARED
105105
STATIC_DEFINES = -DNDEBUG -D_NDEBUG -DLUA_XZ_BUILD_STATIC
106106
LD = $(CC)
107107
LDFLAGS = -shared
108-
LIBS = "-L$(LUA_LIBDIR)" "-L$(LIBLZMA_LIBDIR)" -l$(LIBLZMA_LIB) -l$(LUA_LIB)
108+
LIBS = "-L$(LUA_BINDIR)" "-L$(LUA_LIBDIR)" "-L$(LIBLZMA_LIBDIR)" -l$(LIBLZMA_LIB) -l$(LUA_LIB)
109109
AR = $(MINGW_TRIPLET_PREFIX)ar
110110
ARFLAGS = cru
111111
RANLIB = $(MINGW_TRIPLET_PREFIX)ranlib

0 commit comments

Comments
 (0)