Skip to content

Commit 71528ac

Browse files
authored
Add luarocks to install luautf8, which is needed in the runtime #6
2 parents 48fe07b + ef5de5b commit 71528ac

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
token: ${{ secrets.GITHUB_TOKEN }}
3434
allowUpdates: true
3535
tag: v${{ steps.get-version.outputs.VERSION }}
36-
if: github.ref == 'refs/heads/master'
36+
if: github.ref == 'refs/heads/master'

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,15 @@ luacurl:
4949

5050
# curl is used since mesonInstaller.sh copies over the shared library dylib
5151
# dylibbundler is used to copy over dylibs that lcurl.so uses
52+
#
53+
# luautf8 is used at runtime; the version is picked to match the PathOfBuilding
54+
# version from https://github.com/PathOfBuildingCommunity/PathOfBuilding/blob/5eb8bd3bd2ad1b2ce0ee2f850e69b3197de8572c/Dockerfile#L35
55+
#
56+
# We install luautf8 locally to ensure it works even if we can't write to the
57+
# system, like in Github Actions.
5258
tools:
53-
arch --x86_64 brew install qt@5 luajit zlib meson curl dylibbundler gcc@12
59+
arch --x86_64 brew install qt@5 luajit zlib meson curl dylibbundler gcc@12 luarocks; \
60+
luarocks install --local --lua-version 5.1 luautf8 0.1.6-1
5461

5562
# We don't usually modify the PathOfBuilding directory, so there's rarely a
5663
# need to delete it. We separate it out to a separate task.

editPathOfBuildingBuild.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@ unzip runtime-win32.zip lua/xml.lua lua/base64.lua lua/sha1.lua
3131
mv lua/*.lua .
3232
rmdir lua
3333
cp ../lcurl.so .
34+
cp ~/.luarocks/lib/lua/5.1/lua-utf8.so .
3435
mv src/* .
3536
rmdir src

0 commit comments

Comments
 (0)