Skip to content

Commit 5b43fa5

Browse files
committed
update action
1 parent 9de1af1 commit 5b43fa5

File tree

2 files changed

+47
-44
lines changed

2 files changed

+47
-44
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/upload-artifact@v4
3333
with:
3434
path: ./build/plugin_lua53/**/*
35-
name: plugin_lua53
35+
name: plugin_lua53_android
3636

3737
android_luajit:
3838
runs-on: ubuntu-latest
@@ -54,7 +54,7 @@ jobs:
5454
uses: actions/upload-artifact@v4
5555
with:
5656
path: ./build/plugin_luajit/**/*
57-
name: plugin_luajit
57+
name: plugin_luajit_android
5858

5959
ohos:
6060
runs-on: ubuntu-latest
@@ -83,7 +83,7 @@ jobs:
8383
uses: actions/upload-artifact@v4
8484
with:
8585
path: ./build/plugin_lua53/**/*
86-
name: plugin_lua53
86+
name: plugin_lua53_ohos
8787

8888
linux:
8989
runs-on: ubuntu-latest
@@ -109,7 +109,7 @@ jobs:
109109
uses: actions/upload-artifact@v4
110110
with:
111111
path: ./build/plugin_luajit/**/*
112-
name: plugin_luajit
112+
name: plugin_luajit_linux
113113
ios:
114114
runs-on: macos-latest
115115

@@ -135,7 +135,7 @@ jobs:
135135
uses: actions/upload-artifact@v4
136136
with:
137137
path: ./build/plugin_luajit/**/*
138-
name: plugin_luajit
138+
name: plugin_luajit_ios
139139
osx:
140140
runs-on: macos-latest
141141

@@ -163,7 +163,7 @@ jobs:
163163
uses: actions/upload-artifact@v4
164164
with:
165165
path: ./build/plugin_luajit/**/*
166-
name: plugin_luajit
166+
name: plugin_luajit_osx
167167
windows:
168168
runs-on: windows-2022
169169

@@ -200,7 +200,7 @@ jobs:
200200
uses: actions/upload-artifact@v4
201201
with:
202202
path: ./build/plugin_luajit/**/*
203-
name: plugin_luajit
203+
name: plugin_luajit_window
204204

205205
windows-luajit-32:
206206
runs-on: windows-2022
@@ -222,7 +222,7 @@ jobs:
222222
uses: actions/upload-artifact@v4
223223
with:
224224
path: ./build/plugin_luajit/**/*
225-
name: plugin_luajit
225+
name: plugin_luajit_window32
226226

227227

228228

.github/workflows/publish.yml

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,30 @@ jobs:
3333
uses: actions/upload-artifact@v4
3434
with:
3535
path: ./build/plugin_lua53/**/*
36-
name: plugin_lua53
37-
36+
name: plugin_lua53_android
37+
38+
android_luajit:
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@v2
42+
- name: Install NDK
43+
run: |
44+
cd ~
45+
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip
46+
sudo apt install unzip -y
47+
unzip -q NDK
48+
ANDROID_NDK_HOME=$(pwd)/android-ndk-r15c
49+
- name: Build
50+
run: |
51+
cd build
52+
sudo apt install gcc-multilib libncurses5 -y
53+
./make_android_luajit_arm64.sh
54+
- name: UploadJit
55+
uses: actions/upload-artifact@v4
56+
with:
57+
path: ./build/plugin_luajit/**/*
58+
name: plugin_luajit_android
59+
3860
ohos:
3961
runs-on: ubuntu-latest
4062
steps:
@@ -62,30 +84,8 @@ jobs:
6284
uses: actions/upload-artifact@v4
6385
with:
6486
path: ./build/plugin_lua53/**/*
65-
name: plugin_lua53
87+
name: plugin_lua53_ohos
6688

67-
android_luajit:
68-
runs-on: ubuntu-latest
69-
steps:
70-
- uses: actions/checkout@v2
71-
- name: Install NDK
72-
run: |
73-
cd ~
74-
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip
75-
sudo apt install unzip -y
76-
unzip -q NDK
77-
ANDROID_NDK_HOME=$(pwd)/android-ndk-r15c
78-
- name: Build
79-
run: |
80-
cd build
81-
sudo apt install gcc-multilib libncurses5 -y
82-
./make_android_luajit_arm64.sh
83-
- name: UploadJit
84-
uses: actions/upload-artifact@v4
85-
with:
86-
path: ./build/plugin_luajit/**/*
87-
name: plugin_luajit
88-
8989
linux:
9090
runs-on: ubuntu-latest
9191
steps:
@@ -110,7 +110,7 @@ jobs:
110110
uses: actions/upload-artifact@v4
111111
with:
112112
path: ./build/plugin_luajit/**/*
113-
name: plugin_luajit
113+
name: plugin_luajit_linux
114114
ios:
115115
runs-on: macos-latest
116116

@@ -136,7 +136,7 @@ jobs:
136136
uses: actions/upload-artifact@v4
137137
with:
138138
path: ./build/plugin_luajit/**/*
139-
name: plugin_luajit
139+
name: plugin_luajit_ios
140140
osx:
141141
runs-on: macos-latest
142142

@@ -164,7 +164,7 @@ jobs:
164164
uses: actions/upload-artifact@v4
165165
with:
166166
path: ./build/plugin_luajit/**/*
167-
name: plugin_luajit
167+
name: plugin_luajit_osx
168168
windows:
169169
runs-on: windows-2022
170170

@@ -201,7 +201,7 @@ jobs:
201201
uses: actions/upload-artifact@v4
202202
with:
203203
path: ./build/plugin_luajit/**/*
204-
name: plugin_luajit
204+
name: plugin_luajit_window
205205

206206
windows-luajit-32:
207207
runs-on: windows-2022
@@ -223,26 +223,29 @@ jobs:
223223
uses: actions/upload-artifact@v4
224224
with:
225225
path: ./build/plugin_luajit/**/*
226-
name: plugin_luajit
226+
name: plugin_luajit_window32
227227

228228
publish:
229229
runs-on: ubuntu-latest
230230
needs: [windows,osx,ios,android,windows-luajit-32,ohos,android_luajit,linux]
231231
steps:
232-
- uses: actions/download-artifact@v4.1.7
232+
- uses: actions/download-artifact@v4
233233
with:
234-
name: plugin_luajit
234+
pattern: plugin_luajit_*
235235
path: plugin_luajit/
236+
merge-multiple: true
236237

237-
- uses: actions/download-artifact@v4.1.7
238+
- uses: actions/download-artifact@v4
238239
with:
239-
name: plugin_lua53
240+
pattern: plugin_lua53_*
240241
path: plugin_lua53/
242+
merge-multiple: true
241243

242-
- uses: actions/download-artifact@v4.1.7
244+
- uses: actions/download-artifact@v4
243245
with:
244-
name: plugin_lua54
246+
pattern: plugin_lua54_*
245247
path: plugin_lua54/
248+
merge-multiple: true
246249

247250
- name: Create Release Asset
248251
run: |

0 commit comments

Comments
 (0)