diff options
| -rw-r--r-- | .github/workflows/test.yml | 22 | ||||
| -rw-r--r-- | changelog.md | 6 | ||||
| -rw-r--r-- | make.bat | 7 | ||||
| -rwxr-xr-x | make.sh | 7 | ||||
| -rw-r--r-- | test.lua | 3 |
5 files changed, 35 insertions, 10 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e8ff3632..12e614e5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,13 +6,25 @@ jobs: fail-fast: false matrix: include: - - { os: ubuntu-20.04, platform: linux-x64 } - - { os: macos-14, platform: darwin-arm64 } - - { os: windows-latest, platform: win32-x64 } + - { os: ubuntu-20.04, target: linux, platform: linux-x64 } + - { os: macos-14, target: darwin, platform: darwin-arm64 } + - { os: windows-latest, target: windows, platform: win32-x64 } runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actboy168/setup-luamake@master - - run: luamake -platform ${{ matrix.platform }} + - name: Build for Windows + if: ${{ matrix.target == 'windows' }} + run: .\make.bat + - name: Build for Linux + if: ${{ matrix.target == 'linux' }} + run: | + sudo apt update + sudo apt install ninja-build + ./make.sh + - name: Build for macOS + if: ${{ matrix.target == 'darwin' }} + run: | + brew install ninja + ./make.sh diff --git a/changelog.md b/changelog.md index 80052eb2..e66b74b0 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,10 @@ * `FIX` Don't do diagnostics when the workspace is not ready * `NEW` Reference workspace symbols in comments using `[some text](lua://symbolName)` syntax +## 3.9.1 +`2024-5-14` +* revert extension runtime + ## 3.9.0 `2024-5-11` * `NEW` goto implementation @@ -128,7 +132,7 @@ Cat = 1, Dog = 2, } - + ---@param animal userdata ---@param atp AnimalType ---@return boolean @@ -1,5 +1,10 @@ git submodule update --init --recursive cd 3rd\luamake call compile\install.bat +call compile\build.bat cd ..\.. -call 3rd\luamake\luamake.exe rebuild +IF "%~1"=="" ( + call 3rd\luamake\luamake.exe rebuild +) ELSE ( + call 3rd\luamake\luamake.exe rebuild --platform %1 +) @@ -2,6 +2,11 @@ git submodule update --init --recursive pushd 3rd/luamake +./compile/install.sh ./compile/build.sh popd -./3rd/luamake/luamake rebuild +if [ -z "$1" ]; then + 3rd/luamake/luamake rebuild +else + 3rd/luamake/luamake rebuild --platform "$1" +fi @@ -2,8 +2,7 @@ package.path = package.path .. ';./test/?.lua' .. ';./test/?/init.lua' local fs = require 'bee.filesystem' -local sys = require 'bee.sys' -local rootPath = sys.exe_path():parent_path():parent_path():string() +local rootPath = fs.exe_path():parent_path():parent_path():string() ROOT = fs.path(rootPath) TEST = true DEVELOP = true |