Skip to content

Commit

Permalink
用自己的luamake
Browse files Browse the repository at this point in the history
  • Loading branch information
sumneko committed May 14, 2024
1 parent dea8824 commit aa69591
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 14 deletions.
16 changes: 6 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,13 @@ jobs:
with:
submodules: recursive

- name: Build for others step-1
if: ${{ matrix.platform != 'linux-x64' }}
uses: actboy168/setup-luamake@master
- name: Build for Windows
if: ${{ matrix.platform == 'windows-latest' }}
run: .\make.bat ${{ matrix.platform }}

- name: Build for others step-2
if: ${{ matrix.platform != 'linux-x64' }}
run: luamake -platform ${{ matrix.platform }}

- name: Build for musl
if: ${{ matrix.platform == 'linux-x64' && matrix.libc == 'musl' }}
run: ./make.sh
- name: Build for Non-Windows
if: ${{ matrix.platform != 'windows-latest' }}
run: ./make.sh ${{ matrix.platform }}

- name: Build for x64 glibc
if: ${{ matrix.platform == 'linux-x64' && matrix.libc != 'musl' }}
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actboy168/setup-luamake@master
- run: luamake -platform ${{ matrix.platform }}
- name: Build for Windows
if: ${{ matrix.os == 'windows-latest' }}
run: .\make.bat
- name: Build for Non-Windows
if: ${{ matrix.os != 'windows-latest' }}
run: ./make.sh
1 change: 1 addition & 0 deletions 3rd/ltask
Submodule ltask added at 79a3f1
6 changes: 5 additions & 1 deletion make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ git submodule update --init --recursive
cd 3rd\luamake
call compile\install.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
)
6 changes: 5 additions & 1 deletion make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ git submodule update --init --recursive
pushd 3rd/luamake
./compile/build.sh
popd
./3rd/luamake/luamake rebuild
if [ -z "$1" ]; then
3rd/luamake/luamake.exe rebuild
else
3rd/luamake/luamake.exe rebuild --platform "$1"
fi

0 comments on commit aa69591

Please sign in to comment.