Skip to content

Commit 7e80e0d

Browse files
authored
Update build-x86_64-uola-openwrt.yml
1 parent b6ba362 commit 7e80e0d

File tree

1 file changed

+4
-22
lines changed

1 file changed

+4
-22
lines changed

.github/workflows/build-x86_64-uola-openwrt.yml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -168,28 +168,9 @@ jobs:
168168
id: compile
169169
run: |
170170
echo -e "$(nproc) thread compile"
171-
make tools/compile -j$(nproc) || make tools/compile -j1 V=s
172-
make toolchain/compile -j$(nproc) || make toolchain/compile -j1 V=s
173-
make target/compile -j$(nproc) || make target/compile -j1 V=s IGNORE_ERRORS=1
174-
make diffconfig
175-
make package/compile -j$(nproc) IGNORE_ERRORS=1 || make package/compile -j1 V=s IGNORE_ERRORS=1
176-
make package/index
171+
make -j$(nproc) || make -j1 V=s
177172
echo "::set-output name=status::success"
178173
179-
- name: 设置环境变量
180-
if: steps.compile.outputs.status == 'success'
181-
run: |
182-
cd openwrt/bin/packages/*
183-
PLATFORM=$(basename `pwd`)
184-
echo "::set-env name=PLATFORM::$PLATFORM"
185-
cd openwrt/bin/targets/*
186-
TARGET=$(basename `pwd`)
187-
echo "::set-env name=TARGET::$TARGET"
188-
cd *
189-
SUBTARGET=$(basename `pwd`)
190-
echo "::set-env name=SUBTARGET::$SUBTARGET"
191-
echo "::set-env name=FIRMWARE::$PWD"
192-
193174
# 整理文件
194175
- name: 整理文件
195176
id: organize
@@ -201,13 +182,14 @@ jobs:
201182
rm -rf *uImage
202183
echo "::set-env name=FIRMWARE::$PWD"
203184
echo "::set-output name=status::success"
204-
185+
205186
# 上传固件
206187
- name: 上传固件
207188
uses: actions/upload-artifact@master
208189
if: steps.organize.outputs.status == 'success' && !cancelled()
209190
with:
210-
files: ${{ env.FIRMWARE }}/*
191+
name: ${{ env.BUILD_USER }}-${{ env.DATE }}-OpenWrt-${{ env.BRANCH }}-Firmware
192+
path: ${{ env.FIRMWARE }}
211193

212194
# 微信通知
213195
- name: 微信通知

0 commit comments

Comments
 (0)