Skip to content

Commit 245231b

Browse files
iGlitchiGlitch
authored
revert
1 parent 97536dd commit 245231b

1 file changed

Lines changed: 141 additions & 129 deletions

File tree

‎.github/workflows/build-openwrt.yml‎

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

293293
- name: Update feeds Package
294294
run: |
295-
cd openwrt && ./scripts/feeds update -a -f
295+
file=./scripts/data/feeds_update.txt
296+
while read -r line; do
297+
cd openwrt && ./scripts/feeds update $line
298+
done < "$file"
296299
### ----------------------------------------------------------------- ###
297300
- name: Install feeds Package
298301
run: |
299-
cd openwrt && ./scripts/feeds install -a -f
302+
file=./scripts/data/feeds_install.txt
303+
while read -r line; do
304+
cd openwrt && ./scripts/feeds install $line
305+
done < "$file"
300306
### ----------------------------------------------------------------- ###
301307
- name: Uninstall feeds Package
302308
run: |
303-
cd openwrt && ./scripts/feeds uninstall bluld
309+
file=./scripts/data/feeds_uninstall.txt
310+
while read -r line; do
311+
cd openwrt && ./scripts/feeds uninstall $line
312+
done < "$file"
304313
### ----------------------------------------------------------------- ###
305314
- name: Developer (English language Only)
306315
id: po-english
@@ -612,82 +621,84 @@ jobs:
612621
run: |
613622
cd openwrt
614623
make download -j50
624+
find dl -size -1024c -exec ls -l {} \;
625+
find dl -size -1024c -exec rm -f {} \;
615626
### ----------------------------------------------------------------- ###
616-
# - name: Make
617-
# id: GNUTAR
618-
# run: |
619-
# df -h
620-
# cd openwrt
621-
# let make_process=$(nproc)+2
622-
# make -j${make_process} V=s
623-
### ----------------------------------------------------------------- ###
624-
# - name: Building and installing tools
625-
# id: maketools
626-
# run: |
627-
# df -h
628-
# cd openwrt
629-
# let make_process=$(nproc)+2
630-
# make tools/install -j${make_process} V=s
631-
### ----------------------------------------------------------------- ###
632-
# - name: Building and installing toolchain
633-
# id: maketoolchain
634-
# run: |
635-
# df -h
636-
# cd openwrt
637-
# let make_process=$(nproc)+2
638-
# make toolchain/install -j${make_process} V=s
639-
### ----------------------------------------------------------------- ###
640-
# - name: Building kmods
641-
# id: makekmods
642-
# if: env.BUILD_KMODS == 'true' && !cancelled()
643-
# run: |
644-
# df -h
645-
# cd openwrt
646-
# let make_process=$(nproc)+2
647-
# make target/compile -j${make_process} V=s
648-
### ----------------------------------------------------------------- ###
649-
# - name: Building packages
650-
# id: makepackages
651-
# if: env.BUILD_PACKAGES == 'true' && !cancelled()
652-
# run: >
653-
# df -h
654-
#
655-
# cd openwrt
656-
#
657-
# let make_process=$(nproc)+2
658-
#
659-
# make package/compile -j${make_process} || make package/compile
660-
# -j${make_process} V=s 2>&1 | tee logs/build.log | grep -i -E
661-
# "^make.*(error|[12345]...Entering directory)"
662-
### ----------------------------------------------------------------- ###
663-
# - name: Installing packages
664-
# id: installpackages
665-
# if: env.INSTALL_PACKAGES == 'true' && !cancelled()
666-
# run: >
667-
# df -h
668-
#
669-
# cd openwrt
670-
#
671-
# let make_process=$(nproc)+2
672-
#
673-
# make package/install -j${make_process} || make package/install
674-
# -j${make_process} V=s 2>&1 | tee logs/build.log | grep -i -E
675-
# "^make.*(error|[12345]...Entering directory)"
676-
### ----------------------------------------------------------------- ###
677-
# - name: Indexing packages
678-
# id: indexingpackages
679-
# if: env.INDEX_PACKAGES == 'true' && !cancelled()
680-
# run: >
681-
# df -h
627+
- name: Building and installing GNU tar
628+
id: GNUTAR
629+
run: |
630+
df -h
631+
cd openwrt
632+
let make_process=$(nproc)+2
633+
make tools/tar/compile -j${make_process} V=s
634+
### ----------------------------------------------------------------- ###
635+
- name: Building and installing tools
636+
id: maketools
637+
run: |
638+
df -h
639+
cd openwrt
640+
let make_process=$(nproc)+2
641+
make tools/install -j${make_process} V=s
642+
### ----------------------------------------------------------------- ###
643+
- name: Building and installing toolchain
644+
id: maketoolchain
645+
run: |
646+
df -h
647+
cd openwrt
648+
let make_process=$(nproc)+2
649+
make toolchain/install -j${make_process} V=s
650+
### ----------------------------------------------------------------- ###
651+
- name: Building kmods
652+
id: makekmods
653+
if: env.BUILD_KMODS == 'true' && !cancelled()
654+
run: |
655+
df -h
656+
cd openwrt
657+
let make_process=$(nproc)+2
658+
make target/compile -j${make_process} V=s
659+
### ----------------------------------------------------------------- ###
660+
- name: Building packages
661+
id: makepackages
662+
if: env.BUILD_PACKAGES == 'true' && !cancelled()
663+
run: >
664+
df -h
682665
683-
# cd openwrt
666+
cd openwrt
684667
685-
# let make_process=$(nproc)+2
668+
let make_process=$(nproc)+2
686669
687-
# make package/index -j${make_process} CONFIG_SIGNED_PACKAGES= || make
688-
# package/index -j${make_process} CONFIG_SIGNED_PACKAGES= V=s 2>&1 | tee
689-
# logs/build.log | grep -i -E "^make.*(error|[12345]...Entering
690-
# directory)"
670+
make package/compile -j${make_process} || make package/compile
671+
-j${make_process} V=s 2>&1 | tee logs/build.log | grep -i -E
672+
"^make.*(error|[12345]...Entering directory)"
673+
### ----------------------------------------------------------------- ###
674+
- name: Installing packages
675+
id: installpackages
676+
if: env.INSTALL_PACKAGES == 'true' && !cancelled()
677+
run: >
678+
df -h
679+
680+
cd openwrt
681+
682+
let make_process=$(nproc)+2
683+
684+
make package/install -j${make_process} || make package/install
685+
-j${make_process} V=s 2>&1 | tee logs/build.log | grep -i -E
686+
"^make.*(error|[12345]...Entering directory)"
687+
### ----------------------------------------------------------------- ###
688+
- name: Indexing packages
689+
id: indexingpackages
690+
if: env.INDEX_PACKAGES == 'true' && !cancelled()
691+
run: >
692+
df -h
693+
694+
cd openwrt
695+
696+
let make_process=$(nproc)+2
697+
698+
make package/index -j${make_process} CONFIG_SIGNED_PACKAGES= || make
699+
package/index -j${make_process} CONFIG_SIGNED_PACKAGES= V=s 2>&1 | tee
700+
logs/build.log | grep -i -E "^make.*(error|[12345]...Entering
701+
directory)"
691702
### ----------------------------------------------------------------- ###
692703
- name: Build Firmware (OpenWRT)
693704
id: compile
@@ -696,7 +707,8 @@ jobs:
696707
cd openwrt
697708
echo -e "$(nproc) thread compile"
698709
let Make_Process=$(nproc)+2
699-
make -j${Make_Process} V=s
710+
make -j${Make_Process} target/install || make -j${Make_Process} target/install V=s
711+
echo $?
700712
echo "::set-output name=status::success"
701713
### --------------------------- ###
702714
- name: If Error (Build Firmware)
@@ -707,62 +719,62 @@ jobs:
707719
name: 'OpenWrt_logs${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}'
708720
path: openwrt/logs/
709721
### ----------------------------------------------------------------- ###
710-
# - name: Generate Buildinfo (OpenWRT)
711-
# id: buildinfo
712-
# continue-on-error: true
713-
# run: |
714-
# cd openwrt
715-
# echo -e "$(nproc) thread compile"
716-
# let Make_Process=$(nproc)+2
717-
# make buildinfo V=s
718-
# echo $?
719-
# echo "::set-output name=status::success"
722+
- name: Generate Buildinfo (OpenWRT)
723+
id: buildinfo
724+
continue-on-error: true
725+
run: |
726+
cd openwrt
727+
echo -e "$(nproc) thread compile"
728+
let Make_Process=$(nproc)+2
729+
make buildinfo V=s
730+
echo $?
731+
echo "::set-output name=status::success"
720732
### --------------------------- ###
721-
# - name: If Error (Generate Buildinfo)
722-
# uses: actions/upload-artifact@main
723-
# if: steps.buildinfo.outcome == 'failure'
724-
# && env.UPLOAD_BUILD_LOGS == 'true'
725-
# with:
726-
# name: 'OpenWrt_logs${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}'
727-
# path: openwrt/logs/
728-
### ----------------------------------------------------------------- ###
729-
# - name: Generate JSON Overview (OpenWRT)
730-
# id: overview
731-
# continue-on-error: true
732-
# run: |
733-
# cd openwrt
734-
# echo -e "$(nproc) thread compile"
735-
# let Make_Process=$(nproc)+2
736-
# make json_overview_image_info V=s
737-
# echo $?
738-
# echo "::set-output name=status::success"
733+
- name: If Error (Generate Buildinfo)
734+
uses: actions/upload-artifact@main
735+
if: steps.buildinfo.outcome == 'failure'
736+
&& env.UPLOAD_BUILD_LOGS == 'true'
737+
with:
738+
name: 'OpenWrt_logs${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}'
739+
path: openwrt/logs/
740+
### ----------------------------------------------------------------- ###
741+
- name: Generate JSON Overview (OpenWRT)
742+
id: overview
743+
continue-on-error: true
744+
run: |
745+
cd openwrt
746+
echo -e "$(nproc) thread compile"
747+
let Make_Process=$(nproc)+2
748+
make json_overview_image_info V=s
749+
echo $?
750+
echo "::set-output name=status::success"
739751
### --------------------------- ###
740-
# - name: If Error (Generate JSON Overview)
741-
# uses: actions/upload-artifact@main
742-
# if: steps.overview.outcome == 'failure'
743-
# && env.UPLOAD_BUILD_LOGS == 'true'
744-
# with:
745-
# name: 'OpenWrt_logs${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}'
746-
# path: openwrt/logs/
747-
### ----------------------------------------------------------------- ###
748-
# - name: Generate HASH (OpenWRT)
749-
# id: hash
750-
# continue-on-error: true
751-
# run: |
752-
# cd openwrt
753-
# echo -e "$(nproc) thread compile"
754-
# let Make_Process=$(nproc)+2
755-
# make checksum V=s
756-
# echo $?
757-
# echo "::set-output name=status::success"
752+
- name: If Error (Generate JSON Overview)
753+
uses: actions/upload-artifact@main
754+
if: steps.overview.outcome == 'failure'
755+
&& env.UPLOAD_BUILD_LOGS == 'true'
756+
with:
757+
name: 'OpenWrt_logs${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}'
758+
path: openwrt/logs/
759+
### ----------------------------------------------------------------- ###
760+
- name: Generate HASH (OpenWRT)
761+
id: hash
762+
continue-on-error: true
763+
run: |
764+
cd openwrt
765+
echo -e "$(nproc) thread compile"
766+
let Make_Process=$(nproc)+2
767+
make checksum V=s
768+
echo $?
769+
echo "::set-output name=status::success"
758770
### --------------------------- ###
759-
# - name: If Error (Generate HASH)
760-
# uses: actions/upload-artifact@main
761-
# if: steps.hash.outcome == 'failure'
762-
# && env.UPLOAD_BUILD_LOGS == 'true'
763-
# with:
764-
# name: 'OpenWrt_logs${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}'
765-
# path: openwrt/logs/
771+
- name: If Error (Generate HASH)
772+
uses: actions/upload-artifact@main
773+
if: steps.hash.outcome == 'failure'
774+
&& env.UPLOAD_BUILD_LOGS == 'true'
775+
with:
776+
name: 'OpenWrt_logs${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}'
777+
path: openwrt/logs/
766778
### ----------------------------------------------------------------- ###
767779
- name: OpenWRT Variable Setups
768780
id: VBS

0 commit comments

Comments
 (0)