Skip to content

Commit e34934f

Browse files
authored
Remove luthier.py since it's been superseded entirely by the Luau implementation. (#337)
We no longer need to maintain `luthier.py`, and it poses a frustrating maintenance risk right now to attempt to apply both together. It may be useful in the future to introduce an optional path in the CI to fetch everything from a tarball somewhere and then use cmake/ninja directly instead of running luthier, but we can deal with that when needed.
1 parent 2b74d38 commit e34934f

File tree

3 files changed

+5
-650
lines changed

3 files changed

+5
-650
lines changed

.github/actions/setup-and-build/action.yml

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ inputs:
1313
description: "Additional luthier options"
1414
required: false
1515
default: ""
16-
use-python-luthier:
17-
description: "Builds with the python version of luthier"
18-
type: boolean
19-
required: false
20-
default: false
2116
token:
2217
description: "Token for foreman"
2318
required: true
@@ -30,24 +25,6 @@ outputs:
3025
runs:
3126
using: "composite"
3227
steps:
33-
- name: Set runtime variables
34-
id: run
35-
shell: bash
36-
run: |
37-
if [ "${{ inputs.use-python-luthier }}" = "true" ]; then
38-
echo "runtime=python" >> "$GITHUB_OUTPUT"
39-
echo "ext=py" >> "$GITHUB_OUTPUT"
40-
else
41-
echo "runtime=lute" >> "$GITHUB_OUTPUT"
42-
echo "ext=luau" >> "$GITHUB_OUTPUT"
43-
fi
44-
45-
- name: Set up Python
46-
if: inputs.use-python-luthier
47-
uses: actions/setup-python@v5
48-
with:
49-
python-version: "3.11"
50-
5128
- name: Install tools
5229
uses: Roblox/setup-foreman@v3
5330
with:
@@ -86,20 +63,20 @@ runs:
8663
- name: Fetch ${{ inputs.target }}
8764
if: steps.cache-extern.outputs.cache-hit != 'true'
8865
shell: bash
89-
run: ${{ steps.run.outputs.runtime }} ./tools/luthier.${{ steps.run.outputs.ext }} fetch ${{ inputs.target }}
66+
run: lute ./tools/luthier.luau fetch ${{ inputs.target }}
9067

9168
- name: Configure ${{ inputs.target }}
9269
shell: bash
93-
run: ${{ steps.run.outputs.runtime }} ./tools/luthier.${{ steps.run.outputs.ext }} configure ${{ inputs.target }} --config ${{ inputs.config }} ${{ inputs.options }}
70+
run: lute ./tools/luthier.luau configure ${{ inputs.target }} --config ${{ inputs.config }} ${{ inputs.options }}
9471

9572
- name: Build ${{ inputs.target }}
9673
shell: bash
97-
run: ${{ steps.run.outputs.runtime }} ./tools/luthier.${{ steps.run.outputs.ext }} build ${{ inputs.target }} --config ${{ inputs.config }} ${{ inputs.options }}
74+
run: lute ./tools/luthier.luau build ${{ inputs.target }} --config ${{ inputs.config }} ${{ inputs.options }}
9875

9976
- name: Get Artifact Path
10077
id: artifact_path
10178
shell: bash
10279
run: |
103-
exe_path=$(${{ steps.run.outputs.runtime }} ./tools/luthier.${{ steps.run.outputs.ext }} build ${{ inputs.target }} --config ${{ inputs.config }} --which)
80+
exe_path=$(lute ./tools/luthier.luau build ${{ inputs.target }} --config ${{ inputs.config }} --which)
10481
echo "Executable path: $exe_path" # Debug print
10582
echo "exe_path=$exe_path" >> "$GITHUB_OUTPUT"

.github/workflows/release.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ on:
55
- cron: '0 0 * * *'
66
workflow_dispatch:
77
inputs:
8-
use-python-luthier:
9-
description: "Use the Python version of Luthier"
10-
required: false
11-
default: false
12-
type: boolean
138
nightly:
149
description: "Trigger a nightly build"
1510
required: false
@@ -95,8 +90,7 @@ jobs:
9590
config: release
9691
options: ${{ matrix.options }}
9792
token: ${{ secrets.GITHUB_TOKEN }}
98-
use-python-luthier: ${{ github.event.inputs.use-python-luthier }}
99-
93+
10094
- name: Upload Artifact
10195
uses: actions/upload-artifact@v4
10296
with:

0 commit comments

Comments
 (0)