Skip to content

Commit ed84b67

Browse files
committed
try this
1 parent a3260ca commit ed84b67

File tree

6 files changed

+191
-264
lines changed

6 files changed

+191
-264
lines changed

.github/workflows/build-lua.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Build Lua
2+
on:
3+
workflow_dispatch:
4+
push:
5+
paths:
6+
- '.github/workflows/build-lua.yml'
7+
8+
jobs:
9+
build-lua:
10+
name: Build Lua in Steam Runtime
11+
runs-on: ubuntu-latest
12+
container:
13+
image: registry.gitlab.steamos.cloud/steamrt/scout/sdk
14+
options: --user root
15+
env:
16+
LUA_VERSION: 5.4.6
17+
steps:
18+
- name: Install build dependencies
19+
run: |
20+
apt-get update
21+
apt-get install -y curl build-essential
22+
23+
- name: Download and extract Lua
24+
run: |
25+
cd /tmp
26+
curl -L "https://www.lua.org/ftp/lua-${LUA_VERSION}.tar.gz" -o lua.tar.gz
27+
tar xzf lua.tar.gz
28+
cd "lua-${LUA_VERSION}"
29+
30+
- name: Build Lua
31+
run: |
32+
cd "/tmp/lua-${LUA_VERSION}"
33+
make MYCFLAGS=-fPIC MYLDFLAGS=-shared linux
34+
35+
- name: Upload Lua library
36+
uses: actions/upload-artifact@v4
37+
with:
38+
name: steamrt-lua
39+
path: /tmp/lua-${{ env.LUA_VERSION }}/src/liblua.so
40+
if-no-files-found: error

.github/workflows/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,15 @@ jobs:
8282
with:
8383
workspaces: "./lib -> target"
8484

85+
- name: Download Steam Runtime Lua library
86+
if: matrix.os == 'ubuntu-latest'
87+
uses: dawidd6/action-download-artifact@v8
88+
with:
89+
workflow: build-lua.yml
90+
name: steamrt-lua
91+
path: dist/unzipped
92+
search_artifacts: true
93+
8594
- name: Run cargo tests
8695
working-directory: lib
8796
run: |

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
{ "path": "./scripts/classes/editor/state.lua" },
2626
{ "path": "./scripts/classes/statesprite.lua" },
2727
{ "path": "./scripts/classes/widget.lua" },
28-
{ "path": "./scripts/functions/inception.lua" },
2928
{ "path": "./scripts/functions/other.lua" },
3029
{ "path": "./scripts/functions/string.lua" },
3130
{ "path": "./scripts/functions/table.lua" },

scripts/functions/inception.lua

Lines changed: 0 additions & 125 deletions
This file was deleted.

scripts/main.lua

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -226,22 +226,13 @@ end
226226
--- @param plugin_path string Path where the extension is installed.
227227
function loadlib(plugin_path)
228228
if not app.os.windows then
229-
local success, err = compile_lua(plugin_path)
230-
if not success then
231-
app.alert {
232-
title = "Lua Compilation Error",
233-
text = err or "Unknown error during Lua compilation",
234-
}
235-
return
236-
end
237-
238229
-- Update library path based on OS
239230
if app.os.macos then
240231
package.cpath = package.cpath .. ";?.dylib"
241-
LUA_LIB = "liblua.dylib"
232+
LUA_LIB = "liblua54.dylib"
242233
else
243234
package.cpath = package.cpath .. ";?.so"
244-
LUA_LIB = "liblua.so"
235+
LUA_LIB = "liblua5.4.so"
245236
end
246237
end
247238

0 commit comments

Comments
 (0)