diff options
| author | ruki <[email protected]> | 2021-10-09 12:02:03 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-10-09 12:02:03 +0800 |
| commit | 094b8d16d88787219cf8840b867846a4159de055 (patch) | |
| tree | 48df2e27ac51d94fc53a315f8ad52042e96c629c | |
| parent | a01e17a5049bdd02ddc2514bd47af74cf2ff802d (diff) | |
switch to lua runtime
| -rw-r--r-- | .github/workflows/linux_luajit.yml (renamed from .github/workflows/linux_lua.yml) | 6 | ||||
| -rw-r--r-- | .github/workflows/windows_luajit.yml (renamed from .github/workflows/windows_lua.yml) | 3 | ||||
| -rw-r--r-- | core/xmake.lua | 2 | ||||
| -rw-r--r-- | makefile | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/.github/workflows/linux_lua.yml b/.github/workflows/linux_luajit.yml index 71a365a3f..919c11550 100644 --- a/.github/workflows/linux_lua.yml +++ b/.github/workflows/linux_luajit.yml @@ -1,4 +1,4 @@ -name: Linux (Lua) +name: Linux (Luajit) on: pull_request: @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest concurrency: - group: ${{ github.head_ref }}-Linux-Lua + group: ${{ github.head_ref }}-Linux-Luajit cancel-in-progress: true steps: - uses: actions/checkout@v2 @@ -24,7 +24,7 @@ jobs: - name: Installation run: | - make BACKEND=lua + make RUNTIME=luajit ./scripts/get.sh __local__ __install_only__ source ~/.xmake/profile xmake --version diff --git a/.github/workflows/windows_lua.yml b/.github/workflows/windows_luajit.yml index 3ad8ebf74..8bc06dbf6 100644 --- a/.github/workflows/windows_lua.yml +++ b/.github/workflows/windows_luajit.yml @@ -49,7 +49,7 @@ jobs: - name: Build run: | - xmake f -vD -P core -a ${{ matrix.arch }} --runtime=lua + xmake f -vD -P core -a ${{ matrix.arch }} --runtime=luajit xmake -vD -P core - name: Tests @@ -61,7 +61,6 @@ jobs: Set-Item -Path Env:Path -Value ($Env:XMAKE_PROGRAM_DIR + ";" + $Env:Path) xrepo --version xmake show - #xmake l -v private.utils.bcsave --rootname='@programdir' -x 'scripts/**|templates/**' xmake xmake lua -v -D tests/run.lua - name: Set release arch name diff --git a/core/xmake.lua b/core/xmake.lua index cb4b41daf..a176adf76 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -43,7 +43,7 @@ end -- the runtime option option("runtime") set_showmenu(true) - set_default("luajit") + set_default("lua") set_description("Use luajit or lua runtime") set_values("luajit", "lua") option_end() @@ -17,7 +17,7 @@ endif # use luajit or lua backend ifeq ($(RUNTIME),) -RUNTIME :=luajit +RUNTIME :=lua endif # the temporary directory |