Skip to content

Commit aa69591

Browse files
committed
用自己的luamake
1 parent dea8824 commit aa69591

File tree

5 files changed

+23
-14
lines changed

5 files changed

+23
-14
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,13 @@ jobs:
5050
with:
5151
submodules: recursive
5252

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

57-
- name: Build for others step-2
58-
if: ${{ matrix.platform != 'linux-x64' }}
59-
run: luamake -platform ${{ matrix.platform }}
60-
61-
- name: Build for musl
62-
if: ${{ matrix.platform == 'linux-x64' && matrix.libc == 'musl' }}
63-
run: ./make.sh
57+
- name: Build for Non-Windows
58+
if: ${{ matrix.platform != 'windows-latest' }}
59+
run: ./make.sh ${{ matrix.platform }}
6460

6561
- name: Build for x64 glibc
6662
if: ${{ matrix.platform == 'linux-x64' && matrix.libc != 'musl' }}

.github/workflows/test.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@ jobs:
1414
- uses: actions/checkout@v4
1515
with:
1616
submodules: recursive
17-
- uses: actboy168/setup-luamake@master
18-
- run: luamake -platform ${{ matrix.platform }}
17+
- name: Build for Windows
18+
if: ${{ matrix.os == 'windows-latest' }}
19+
run: .\make.bat
20+
- name: Build for Non-Windows
21+
if: ${{ matrix.os != 'windows-latest' }}
22+
run: ./make.sh

3rd/ltask

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 79a3f1bd03ed3bd59a246daaa3398819efee08dd

make.bat

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@ git submodule update --init --recursive
22
cd 3rd\luamake
33
call compile\install.bat
44
cd ..\..
5-
call 3rd\luamake\luamake.exe rebuild
5+
IF "%~1"=="" (
6+
call 3rd\luamake\luamake.exe rebuild
7+
) ELSE (
8+
call 3rd\luamake\luamake.exe rebuild --platform %1
9+
)

make.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ git submodule update --init --recursive
44
pushd 3rd/luamake
55
./compile/build.sh
66
popd
7-
./3rd/luamake/luamake rebuild
7+
if [ -z "$1" ]; then
8+
3rd/luamake/luamake.exe rebuild
9+
else
10+
3rd/luamake/luamake.exe rebuild --platform "$1"
11+
fi

0 commit comments

Comments
 (0)