Skip to content

Commit 8621b37

Browse files
authored
Update build-openwrt.yml
1 parent 6d56fda commit 8621b37

1 file changed

Lines changed: 7 additions & 19 deletions

File tree

.github/workflows/build-openwrt.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -292,24 +292,15 @@ jobs:
292292

293293
- name: Update feeds Package
294294
run: |
295-
file=./scripts/data/feeds_update.txt
296-
while read -r line; do
297-
cd openwrt && ./scripts/feeds update $line
298-
done < "$file"
295+
cd openwrt && ./scripts/feeds update -a -f
299296
### ----------------------------------------------------------------- ###
300297
- name: Install feeds Package
301298
run: |
302-
file=./scripts/data/feeds_install.txt
303-
while read -r line; do
304-
cd openwrt && ./scripts/feeds install $line
305-
done < "$file"
299+
cd openwrt && ./scripts/feeds install -a -f
306300
### ----------------------------------------------------------------- ###
307301
- name: Uninstall feeds Package
308302
run: |
309-
file=./scripts/data/feeds_uninstall.txt
310-
while read -r line; do
311-
cd openwrt && ./scripts/feeds uninstall $line
312-
done < "$file"
303+
cd openwrt && ./scripts/feeds uninstall bluld
313304
### ----------------------------------------------------------------- ###
314305
- name: Developer (English language Only)
315306
id: po-english
@@ -621,16 +612,14 @@ jobs:
621612
run: |
622613
cd openwrt
623614
make download -j50
624-
find dl -size -1024c -exec ls -l {} \;
625-
find dl -size -1024c -exec rm -f {} \;
626615
### ----------------------------------------------------------------- ###
627-
- name: Building and installing GNU tar
616+
- name: Make
628617
id: GNUTAR
629618
run: |
630619
df -h
631620
cd openwrt
632621
let make_process=$(nproc)+2
633-
make tools/tar/compile -j${make_process} V=s
622+
make -j${make_process} V=s
634623
### ----------------------------------------------------------------- ###
635624
- name: Building and installing tools
636625
id: maketools
@@ -707,8 +696,7 @@ jobs:
707696
cd openwrt
708697
echo -e "$(nproc) thread compile"
709698
let Make_Process=$(nproc)+2
710-
make -j${Make_Process} target/install || make -j${Make_Process} target/install V=s
711-
echo $?
699+
make -j${Make_Process}
712700
echo "::set-output name=status::success"
713701
### --------------------------- ###
714702
- name: If Error (Build Firmware)
@@ -1058,4 +1046,4 @@ jobs:
10581046
git -C "${GITHUB_WORKSPACE}/openwrt/feeds/luci" reset --hard HEAD^
10591047
cd ${GITHUB_WORKSPACE}/openwrt/staging_dir
10601048
rm -rf packages target-*
1061-
### ----------------------------------------------------------------- ###
1049+
### ----------------------------------------------------------------- ###

0 commit comments

Comments
 (0)