Skip to content

Fix Windows + LuaJIT build in CI #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gilzoide merged 6 commits into from
Jul 10, 2026
Merged

Fix Windows + LuaJIT build in CI #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75b8b38
Trigger LuaJIT build using msvcbuild if vcvarsall_path is defined
gilzoide Jul 10, 2026
541ba12
Try using Visual Studio 2026 in CI
gilzoide Jul 10, 2026
35ba58f
Try using SCons Builder `chdir` parameter instead of using `cd` command
gilzoide Jul 10, 2026
5492c13
Revert "Trigger LuaJIT build using msvcbuild if vcvarsall_path is def…
gilzoide Jul 10, 2026
7b87576
Try upgrading SCons to 4.10.1
gilzoide Jul 10, 2026
34caf92
Update path to vcvarsall
gilzoide Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defaults:

env:
SCONS_CACHE: ${{ github.workspace }}/.scons-cache
SCONS_VERSION: 4.9.1
SCONS_VERSION: 4.10.1

jobs:
build_linux:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.target }}-${{ matrix.lua-runtime }}-
- name: Build artifact
run: |
scons platform=${{ matrix.platform }} arch=${{ matrix.arch }} target=${{ matrix.target }} lua_runtime=${{ matrix.lua-runtime }} vcvarsall_path="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
scons platform=${{ matrix.platform }} arch=${{ matrix.arch }} target=${{ matrix.target }} lua_runtime=${{ matrix.lua-runtime }} vcvarsall_path="C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion tools/luajit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ def generate(env):
if env["vcvarsall_path"] and env["arch"] == "arm64" and platform.machine().lower() == "amd64"
else ""
),
f"cd {build_dir}/luajit/src",
f"msvcbuild.bat {"debug" if env.get("debug_crt") else ""} amalg mixed",
]
libluajit = env.Command(
f"{build_dir}/luajit/src/lua51.lib",
"lib",
action=" && ".join(cmd for cmd in cmds if cmd),
chdir=f"{build_dir}/luajit/src",
)
# macOS universal special case: build x86_64 and arm64 separately, then `lipo` them together
elif env["platform"] == "macos" and env["arch"] == "universal":
Expand Down
Loading