update lua

xmake-io · Nov 21, 2024 · 4deeb40 · 4deeb40
1 parent e9382cf
commit 4deeb40
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 31 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -11,10 +11,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        luaVersion: ["5.4.1", "5.1.5", "luajit-2.1.0-beta3"]
+        luaVersion: ["5.4.1", "5.1.5", "luajit-openresty"]
         luarocksVersion: ["3.5.0", "3.0.1"]
     runs-on: ${{ matrix.os }}
 
+    concurrency:
+        group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Linux-${{ matrix.luaVersion }}-${{ matrix.luarocksVersion }}
+        cancel-in-progress: true
+
     steps:
       - uses: actions/checkout@v2
       - uses: leafo/gh-actions-lua@v8

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -11,10 +11,14 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        luaVersion: ["5.4.1", "5.1.5", "luajit-2.1.0-beta3"]
+        luaVersion: ["5.4.1", "5.1.5", "luajit-openresty"]
         luarocksVersion: ["3.5.0", "3.0.1"]
     runs-on: ${{ matrix.os }}
 
+    concurrency:
+        group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-MacOS-${{ matrix.luaVersion }}-${{ matrix.luarocksVersion }}
+        cancel-in-progress: true
+
     steps:
       - uses: actions/checkout@v2
       - uses: leafo/gh-actions-lua@v8

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -11,12 +11,17 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        luaVersion: ["5.4.1"]
+        luaVersion: ["5.3.1"]
     runs-on: ${{ matrix.os }}
 
+    concurrency:
+        group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Windows-${{ matrix.luaVersion }}
+        cancel-in-progress: true
+
     steps:
       - uses: actions/checkout@v2
-      - uses: leafo/gh-actions-lua@v8
+        #- uses: ilammy/msvc-dev-cmd@v1
+        #- uses: leafo/gh-actions-lua@v10
         with:
           luaVersion: ${{ matrix.luaVersion }}
 
@@ -34,19 +39,21 @@ jobs:
           $Env:XMAKE_PROGRAM_DIR = $(Resolve-Path ./xmakesrc/xmake)
           Set-Item -Path Env:Path -Value ($Env:XMAKE_PROGRAM_DIR + ";" + $Env:Path)
           xmake --version
-          Invoke-WebRequest "https://luarocks.github.io/luarocks/releases/luarocks-3.11.1-windows-64.zip" -UseBasicParsing -OutFile ./luarocks.zip
+          #Invoke-WebRequest "https://luarocks.github.io/luarocks/releases/luarocks-3.11.1-windows-64.zip" -UseBasicParsing -OutFile ./luarocks.zip
+          #Expand-Archive ./luarocks.zip -DestinationPath ./luarocks
+          #Push-Location ./luarocks/luarocks-3.11.1-windows-64
+          Invoke-WebRequest "https://github.com/xmake-mirror/luarocks/releases/download/v3.5.0/luarocks-all-3.5.0-windows-64.zip" -UseBasicParsing -OutFile ./luarocks.zip
           Expand-Archive ./luarocks.zip -DestinationPath ./luarocks
-          Push-Location ./luarocks/luarocks-3.11.1-windows-64
-          ./luarocks.exe install --local --verbose ../rockspecs/example1-1.0-1.rockspec
+          ./luarocks.exe install --local ../rockspecs/example1-1.0-1.rockspec
           xmake l os.files "C:/Users/runneradmin/AppData/Roaming/luarocks/**"
           #$Env:LUA_PATH = $(Resolve-Path C:/Users/runneradmin/AppData/Roaming/luarocks/share/lua/5.3/example1/test.lua)
           #./bin/lua -e "print(require('example1.test'))"
           $Env:LUA_CPATH = $(Resolve-Path C:/Users/runneradmin/AppData/Roaming/luarocks/lib/lua/5.3/example1/hello.dll)
-          lua -e "print(require('example1.hello'))"
+          ./bin/lua -e "print(require('example1.hello'))"
           ./luarocks install --local ../rockspecs/example2-1.0-1.rockspec
           xmake l os.files "C:/Users/runneradmin/AppData/Roaming/luarocks/**"
           #$Env:LUA_PATH = $(Resolve-Path C:/Users/runneradmin/AppData/Roaming/luarocks/share/lua/5.3/example2/test.lua)
           #./bin/lua -e "print(require('example2.test'))"
           $Env:LUA_CPATH = $(Resolve-Path C:/Users/runneradmin/AppData/Roaming/luarocks/lib/lua/5.3/example2/hello.dll)
-          lua -e "print(require('example2.hello'))"
+          ./bin/lua -e "print(require('example2.hello'))"
 
diff --git a/README.md b/README.md
@@ -5,17 +5,6 @@
 
   <h1>luarocks-build-xmake</h1>
 
-  <div>
-    <a href="https://github.com/xmake-io/luarocks-build-xmake/actions?query=workflow%3AWindows">
-      <img src="https://img.shields.io/github/workflow/status/xmake-io/luarocks-build-xmake/Windows/master.svg?style=flat-square&logo=windows" alt="github-ci" />
-    </a>
-    <a href="https://github.com/xmake-io/luarocks-build-xmake/actions?query=workflow%3ALinux">
-      <img src="https://img.shields.io/github/workflow/status/xmake-io/luarocks-build-xmake/Linux/master.svg?style=flat-square&logo=linux" alt="github-ci" />
-    </a>
-    <a href="https://github.com/xmake-io/luarocks-build-xmake/actions?query=workflow%3AmacOS">
-      <img src="https://img.shields.io/github/workflow/status/xmake-io/luarocks-build-xmake/macOS/master.svg?style=flat-square&logo=apple" alt="github-ci" />
-    </a>
-  </div>
   <div>
     <a href="https://www.reddit.com/r/xmake-io/">
       <img src="https://img.shields.io/badge/chat-on%20reddit-ff3f34.svg?style=flat-square" alt="Reddit" />

diff --git a/README_zh.md b/README_zh.md
@@ -5,17 +5,6 @@
 
   <h1>luarocks-build-xmake</h1>
 
-  <div>
-    <a href="https://github.com/xmake-io/luarocks-build-xmake/actions?query=workflow%3AWindows">
-      <img src="https://img.shields.io/github/workflow/status/xmake-io/luarocks-build-xmake/Windows/master.svg?style=flat-square&logo=windows" alt="github-ci" />
-    </a>
-    <a href="https://github.com/xmake-io/luarocks-build-xmake/actions?query=workflow%3ALinux">
-      <img src="https://img.shields.io/github/workflow/status/xmake-io/luarocks-build-xmake/Linux/master.svg?style=flat-square&logo=linux" alt="github-ci" />
-    </a>
-    <a href="https://github.com/xmake-io/luarocks-build-xmake/actions?query=workflow%3AmacOS">
-      <img src="https://img.shields.io/github/workflow/status/xmake-io/luarocks-build-xmake/macOS/master.svg?style=flat-square&logo=apple" alt="github-ci" />
-    </a>
-  </div>
   <div>
     <a href="https://www.reddit.com/r/xmake-io/">
       <img src="https://img.shields.io/badge/chat-on%20reddit-ff3f34.svg?style=flat-square" alt="Reddit" />