Skip to content

fix(ci): setup luamake correctly #109

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
cloudwu merged 1 commit into from
Jul 1, 2026
Merged

fix(ci): setup luamake correctly #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 27 additions & 6 deletions .github/actions/sample/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,32 @@ runs:
run: |
git submodule update --init --recursive

- name: Setup LuaMake
if: steps.cache.outputs.cache-hit != 'true'
uses: ./.github/actions/setup-luamake
with:
soluna_path: ${{ inputs.soluna_path }}
- name: Resolve LuaMake
id: luamake
if: runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true'
working-directory: ${{ inputs.soluna_path }}
shell: bash
run: |
case "$RUNNER_ARCH" in
X64)
luamake_platform=linux
;;
ARM64)
luamake_platform=linux_arm64
;;
*)
echo "Unsupported LuaMake runner: ${RUNNER_OS}-${RUNNER_ARCH}" >&2
exit 1
;;
esac

luamake_path="bin/luamake-bin/bin/$luamake_platform/luamake"
if [ ! -f "$luamake_path" ]; then
echo "LuaMake binary not found: $luamake_path" >&2
exit 1
fi
chmod +x "$luamake_path"
echo "path=$luamake_path" >> "$GITHUB_OUTPUT"

- name: Setup Emscripten
if: runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true'
Expand All @@ -60,7 +81,7 @@ runs:
shell: bash
working-directory: ${{ inputs.soluna_path }}
run: |
luamake -compiler emcc sample
"${{ steps.luamake.outputs.path }}" -compiler emcc sample

- name: Set output
id: set-output
Expand Down
56 changes: 0 additions & 56 deletions .github/actions/setup-luamake/action.yml
View file
Open in desktop

This file was deleted.

51 changes: 44 additions & 7 deletions .github/actions/soluna/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,48 @@ runs:
run: |
git submodule update --init --recursive
shell: bash
- name: Setup LuaMake
- name: Resolve LuaMake
id: luamake
if: steps.cache.outputs.cache-hit != 'true'
uses: ./.github/actions/setup-luamake
with:
soluna_path: ${{ inputs.soluna_path }}
working-directory: ${{ inputs.soluna_path }}
shell: bash
run: |
case "${RUNNER_OS}-${RUNNER_ARCH}" in
Linux-X64)
luamake_platform=linux
luamake_exe=luamake
;;
Linux-ARM64)
luamake_platform=linux_arm64
luamake_exe=luamake
;;
macOS-X64)
luamake_platform=osx
luamake_exe=luamake
;;
macOS-ARM64)
luamake_platform=osx_arm64
luamake_exe=luamake
;;
Windows-*)
luamake_platform=win32
luamake_exe=luamake.exe
;;
*)
echo "Unsupported LuaMake runner: ${RUNNER_OS}-${RUNNER_ARCH}" >&2
exit 1
;;
esac

luamake_path="bin/luamake-bin/bin/$luamake_platform/$luamake_exe"
if [ ! -f "$luamake_path" ]; then
echo "LuaMake binary not found: $luamake_path" >&2
exit 1
fi
if [ "$RUNNER_OS" != "Windows" ]; then
chmod +x "$luamake_path"
fi
echo "path=$luamake_path" >> "$GITHUB_OUTPUT"
- name: Install Dependencies (Linux)
shell: bash
if: runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true'
Expand All @@ -73,7 +110,7 @@ runs:
} else {
$env:LUAMAKE_BUILD_TYPE = 'release'
}
luamake -mode $env:LUAMAKE_BUILD_TYPE soluna
& "${{ steps.luamake.outputs.path }}" -mode $env:LUAMAKE_BUILD_TYPE soluna
- name: Build (Unix)
if: runner.os != 'Windows' && steps.cache.outputs.cache-hit != 'true'
shell: bash
Expand All @@ -84,7 +121,7 @@ runs:
else
export LUAMAKE_BUILD_TYPE=release
fi
luamake -mode $LUAMAKE_BUILD_TYPE soluna
"${{ steps.luamake.outputs.path }}" -mode $LUAMAKE_BUILD_TYPE soluna
- uses: mymindstorm/setup-emsdk@v14
if: runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true'
with:
Expand All @@ -100,7 +137,7 @@ runs:
else
export LUAMAKE_BUILD_TYPE=release
fi
luamake -mode $LUAMAKE_BUILD_TYPE -compiler emcc
"${{ steps.luamake.outputs.path }}" -mode $LUAMAKE_BUILD_TYPE -compiler emcc
SOLUNA_JS="soluna.js"
SOLUNA_JS_PATH=$(find bin -name $SOLUNA_JS | head -n 1)
sed -i 's/setBindGroup(groupIndex,group,(growMemViews(),HEAPU32),dynamicOffsetsPtr>>2,dynamicOffsetCount)/setBindGroup(groupIndex,group,(growMemViews(),HEAPU32).subarray(dynamicOffsetsPtr>>2,(dynamicOffsetsPtr>>2)+dynamicOffsetCount))/g' "$SOLUNA_JS_PATH"
Expand Down
Loading