Skip to content

Commit 78cd3a7

Browse files
chexiongshengchexiongsheng
committed
合入官方库的构建
1 parent 909a076 commit 78cd3a7

File tree

3 files changed

+232
-80
lines changed

3 files changed

+232
-80
lines changed

‎.github/workflows/build.yml‎

Lines changed: 107 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,77 @@ jobs:
1414
- name: Install NDK
1515
run: |
1616
cd ~
17-
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip
17+
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r21b-linux-x86_64.zip
1818
sudo apt install unzip -y
1919
unzip -q NDK
20-
ANDROID_NDK_HOME=$(pwd)/android-ndk-r15c
20+
ANDROID_NDK_HOME=$(pwd)/android-ndk-r21b
2121
- name: Build
2222
run: |
2323
cd build
2424
./make_android_lua54.sh
2525
./make_android_lua53.sh
26-
sudo apt install gcc-multilib
27-
./make_android_luajit_arm64.sh
2826
- name: Upload
29-
uses: actions/upload-artifact@v2
27+
uses: actions/upload-artifact@v4
3028
with:
3129
path: ./build/plugin_lua54/**/*
32-
name: plugin_lua54
30+
name: plugin_lua54_android
3331
- name: Upload53
34-
uses: actions/upload-artifact@v2
32+
uses: actions/upload-artifact@v4
3533
with:
3634
path: ./build/plugin_lua53/**/*
37-
name: plugin_lua53
35+
name: plugin_lua53_android
36+
37+
android_luajit:
38+
runs-on: ubuntu-22.04
39+
steps:
40+
- uses: actions/checkout@v2
41+
- name: Install NDK
42+
run: |
43+
cd ~
44+
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip
45+
sudo apt install unzip -y
46+
unzip -q NDK
47+
ANDROID_NDK_HOME=$(pwd)/android-ndk-r15c
48+
- name: Build
49+
run: |
50+
cd build
51+
sudo apt install gcc-multilib libncurses5 -y
52+
./make_android_luajit_arm64.sh
3853
- name: UploadJit
39-
uses: actions/upload-artifact@v2
54+
uses: actions/upload-artifact@v4
4055
with:
4156
path: ./build/plugin_luajit/**/*
42-
name: plugin_luajit
57+
name: plugin_luajit_android
58+
59+
ohos:
60+
runs-on: ubuntu-latest
61+
steps:
62+
- uses: actions/checkout@v2
63+
- name: Install NDK
64+
run: |
65+
cd ~
66+
cd ~
67+
curl -O https://repo.huaweicloud.com/harmonyos/os/4.1-Release/ohos-sdk-windows_linux-public.tar.gz
68+
tar xvfz ohos-sdk-windows_linux-public.tar.gz
69+
cd ohos-sdk/linux
70+
unzip -o -d ./ native-linux-x64-4.1.7.5-Release.zip
71+
- name: Build
72+
run: |
73+
cd build
74+
chmod +x make_ohos_lua5*.sh
75+
OHOS_NDK_HOME=~/ohos-sdk/linux/native ./make_ohos_lua54.sh
76+
OHOS_NDK_HOME=~/ohos-sdk/linux/native ./make_ohos_lua53.sh
77+
- name: Upload
78+
uses: actions/upload-artifact@v4
79+
with:
80+
path: ./build/plugin_lua54/**/*
81+
name: plugin_lua54_ohos
82+
- name: Upload53
83+
uses: actions/upload-artifact@v4
84+
with:
85+
path: ./build/plugin_lua53/**/*
86+
name: plugin_lua53_ohos
87+
4388
linux:
4489
runs-on: ubuntu-latest
4590
steps:
@@ -51,20 +96,20 @@ jobs:
5196
./make_linux64_lua53.sh
5297
./make_linux64_luajit.sh
5398
- name: Upload
54-
uses: actions/upload-artifact@v2
99+
uses: actions/upload-artifact@v4
55100
with:
56101
path: ./build/plugin_lua54/**/*
57-
name: plugin_lua54
102+
name: plugin_lua54_linux
58103
- name: Upload53
59-
uses: actions/upload-artifact@v2
104+
uses: actions/upload-artifact@v4
60105
with:
61106
path: ./build/plugin_lua53/**/*
62-
name: plugin_lua53
107+
name: plugin_lua53_linux
63108
- name: UploadJit
64-
uses: actions/upload-artifact@v2
109+
uses: actions/upload-artifact@v4
65110
with:
66111
path: ./build/plugin_luajit/**/*
67-
name: plugin_luajit
112+
name: plugin_luajit_linux
68113
ios:
69114
runs-on: macos-latest
70115

@@ -77,22 +122,22 @@ jobs:
77122
./make_ios_lua53.sh
78123
./make_ios_luajit.sh
79124
- name: Upload
80-
uses: actions/upload-artifact@v2
125+
uses: actions/upload-artifact@v4
81126
with:
82127
path: ./build/plugin_lua54/**/*
83-
name: plugin_lua54
128+
name: plugin_lua54_ios
84129
- name: Upload53
85-
uses: actions/upload-artifact@v2
130+
uses: actions/upload-artifact@v4
86131
with:
87132
path: ./build/plugin_lua53/**/*
88-
name: plugin_lua53
133+
name: plugin_lua53_ios
89134
- name: UploadJit
90-
uses: actions/upload-artifact@v2
135+
uses: actions/upload-artifact@v4
91136
with:
92137
path: ./build/plugin_luajit/**/*
93-
name: plugin_luajit
138+
name: plugin_luajit_ios
94139
osx:
95-
runs-on: macos-10.15
140+
runs-on: macos-latest
96141

97142
steps:
98143
- uses: actions/checkout@v2
@@ -102,23 +147,25 @@ jobs:
102147
./make_osx_lua54.sh
103148
./make_osx_lua53.sh
104149
./make_osx_luajit.sh
150+
./make_osx_silicon_lua53.sh
151+
./make_osx_silicon_lua54.sh
105152
- name: Upload
106-
uses: actions/upload-artifact@v2
153+
uses: actions/upload-artifact@v4
107154
with:
108155
path: ./build/plugin_lua54/**/*
109-
name: plugin_lua54
156+
name: plugin_lua54_osx
110157
- name: Upload53
111-
uses: actions/upload-artifact@v2
158+
uses: actions/upload-artifact@v4
112159
with:
113160
path: ./build/plugin_lua53/**/*
114-
name: plugin_lua53
161+
name: plugin_lua53_osx
115162
- name: UploadJit
116-
uses: actions/upload-artifact@v2
163+
uses: actions/upload-artifact@v4
117164
with:
118165
path: ./build/plugin_luajit/**/*
119-
name: plugin_luajit
166+
name: plugin_luajit_osx
120167
windows:
121-
runs-on: windows-2016
168+
runs-on: windows-2022
122169

123170
steps:
124171
- uses: actions/checkout@v2
@@ -130,28 +177,52 @@ jobs:
130177
run: |
131178
cd build
132179
.\make_win_lua54.bat
180+
.\make_uwp_lua54.bat
133181
.\make_win32_lua53.bat
134182
.\make_win64_lua53.bat
183+
.\make_uwp.bat
135184
- uses: ilammy/msvc-dev-cmd@v1
136185
- name: Build Luajit
137186
run: |
138187
cd build
139188
.\make_win64_luajit.bat
140189
- name: Upload
141-
uses: actions/upload-artifact@v2
190+
uses: actions/upload-artifact@v4
142191
with:
143192
path: ./build/plugin_lua54/**/*
144-
name: plugin_lua54
193+
name: plugin_lua54_window
145194
- name: Upload53
146-
uses: actions/upload-artifact@v2
195+
uses: actions/upload-artifact@v4
147196
with:
148197
path: ./build/plugin_lua53/**/*
149-
name: plugin_lua53
198+
name: plugin_lua53_window
199+
- name: UploadJit
200+
uses: actions/upload-artifact@v4
201+
with:
202+
path: ./build/plugin_luajit/**/*
203+
name: plugin_luajit_window
204+
205+
windows-luajit-32:
206+
runs-on: windows-2022
207+
208+
steps:
209+
- uses: actions/checkout@v2
210+
211+
- name: Insatll MSVC
212+
uses: microsoft/[email protected]
213+
214+
- uses: ilammy/msvc-dev-cmd@v1
215+
with:
216+
arch: x86
217+
- name: Build Luajit
218+
run: |
219+
cd build
220+
.\make_win32_luajit.bat
150221
- name: UploadJit
151-
uses: actions/upload-artifact@v2
222+
uses: actions/upload-artifact@v4
152223
with:
153224
path: ./build/plugin_luajit/**/*
154-
name: plugin_luajit
225+
name: plugin_luajit_window32
155226

156227

157228

0 commit comments

Comments
 (0)