Skip to content

Commit 2cfa80c

Browse files
ZacharyBaconZacharyBacon
authored
Merge branch 'haiibo:main' into main
2 parents 6dfa5e7 + bf959be commit 2cfa80c

23 files changed

+172
-299
lines changed

‎.github/workflows/ARMv8-Docker-BuildX.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
echo "警告⚠"
3030
echo "分配的服务器性能有限，若选择的插件过多，务必注意CPU性能！"
31-
echo -e "已知CPU型号（降序）：8370C，8272CL，8171M，E5-2673 \n"
31+
echo -e "已知CPU型号（降序）：7763，8370C，8272CL，8171M，E5-2673 \n"
3232
echo "--------------------------CPU信息--------------------------"
3333
echo "CPU物理数量：$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
3434
echo -e "CPU核心信息：$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c) \n"

‎.github/workflows/ARMv8-Docker-OpenWrt.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
#===============================================
2-
# Description: Build OpenWrt
3-
# File name: build-openwrt.yml
4-
# Lisence: MIT
5-
# Author: P3TERX
6-
# https://github.com/P3TERX
7-
#===============================================
8-
91
name: ARMv8 Docker OpenWrt
102

113
on:
@@ -34,7 +26,7 @@ jobs:
3426
run: |
3527
echo "警告⚠"
3628
echo "分配的服务器性能有限，若选择的插件过多，务必注意CPU性能！"
37-
echo -e "已知CPU型号（降序）：8370C，8272CL，8171M，E5-2673 \n"
29+
echo -e "已知CPU型号（降序）：7763，8370C，8272CL，8171M，E5-2673 \n"
3830
echo "--------------------------CPU信息--------------------------"
3931
echo "CPU物理数量：$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
4032
echo -e "CPU核心信息：$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c) \n"
@@ -114,7 +106,7 @@ jobs:
114106
echo "DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV
115107

116108
- name: Check Space Usage
117-
if: always()
109+
if: (!cancelled())
118110
run: df -hT
119111

120112
- name: Organize Files

‎.github/workflows/ARMv8-Mini-OpenWrt.yml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
#===============================================
2-
# Description: Build OpenWrt
3-
# File name: build-openwrt.yml
4-
# Lisence: MIT
5-
# Author: P3TERX
6-
# https://github.com/P3TERX
7-
#===============================================
8-
91
name: ARMv8 Mini OpenWrt
102

113
on:
@@ -41,7 +33,7 @@ jobs:
4133
run: |
4234
echo "警告⚠"
4335
echo "分配的服务器性能有限，若选择的插件过多，务必注意CPU性能！"
44-
echo -e "已知CPU型号（降序）：8370C，8272CL，8171M，E5-2673 \n"
36+
echo -e "已知CPU型号（降序）：7763，8370C，8272CL，8171M，E5-2673 \n"
4537
echo "--------------------------CPU信息--------------------------"
4638
echo "CPU物理数量：$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
4739
echo -e "CPU核心信息：$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c) \n"
@@ -134,7 +126,7 @@ jobs:
134126
echo "FILE_DATE=$(date +"%Y.%m.%d")" >> $GITHUB_ENV
135127

136128
- name: Check Space Usage
137-
if: always()
129+
if: (!cancelled())
138130
run: df -hT
139131

140132
- name: Upload Bin Directory
@@ -212,7 +204,7 @@ jobs:
212204

213205
- name: Package OpenWrt Firmware
214206
if: steps.download.outputs.status == 'success'
215-
uses: unifreq/openwrt_packit@master
207+
uses: ophub/flippy-openwrt-actions@main
216208
env:
217209
OPENWRT_ARMVIRT: openwrt-armvirt/*rootfs.tar.gz
218210
PACKAGE_SOC: all

‎.github/workflows/ARMv8-Package.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
#===============================================
2-
# Description: ARMv8 Package
3-
# File name: armv8-package.yml
4-
# Lisence: MIT
5-
# Author: HAIIBO
6-
# https://github.com/haiibo
7-
#===============================================
8-
91
name: ARMv8 Package
102

113
on:
@@ -74,7 +66,7 @@ jobs:
7466

7567
- name: Package OpenWrt Firmware
7668
if: steps.download.outputs.status == 'success'
77-
uses: ophub/flippy-openwrt-actions@main
69+
uses: unifreq/openwrt_packit@master
7870
env:
7971
OPENWRT_ARMVIRT: openwrt/bin/targets/*/*/*rootfs.tar.gz
8072
PACKAGE_SOC: all

‎.github/workflows/ARMv8-Plus-OpenWrt.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
#===============================================
2-
# Description: Build OpenWrt
3-
# File name: build-openwrt.yml
4-
# Lisence: MIT
5-
# Author: P3TERX
6-
# https://github.com/P3TERX
7-
#===============================================
8-
91
name: ARMv8 Plus OpenWrt
102

113
on:
@@ -181,7 +173,7 @@ jobs:
181173
run: |
182174
echo "警告⚠"
183175
echo "分配的服务器性能有限，若选择的插件过多，务必注意CPU性能！"
184-
echo -e "已知CPU型号（降序）：8370C，8272CL，8171M，E5-2673 \n"
176+
echo -e "已知CPU型号（降序）：7763，8370C，8272CL，8171M，E5-2673 \n"
185177
echo "--------------------------CPU信息--------------------------"
186178
echo "CPU物理数量：$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
187179
echo -e "CPU核心信息：$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c) \n"
@@ -197,7 +189,7 @@ jobs:
197189
run: |
198190
docker rmi $(docker images -q)
199191
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android
200-
sudo -E apt-get -y purge azure-cli* docker* ghc* zulu* llvm* firefox* google* dotnet* powershell* openjdk* mysql* php* mongodb* moby* snap* aspnetcore*
192+
sudo -E apt-get -y purge azure-cli* docker* ghc* zulu* llvm* firefox* google* dotnet* powershell* openjdk* mysql* php* mongodb* snap* aspnetcore*
201193
sudo -E apt-get -qq update
202194
sudo -E apt-get -y install libfuse-dev $(curl -fsSL is.gd/depends_ubuntu_2204)
203195
sudo -E apt-get -qq autoremove --purge
@@ -300,7 +292,7 @@ jobs:
300292
echo "FILE_DATE=$(date +"%Y.%m.%d")" >> $GITHUB_ENV
301293

302294
- name: Check Space Usage
303-
if: always()
295+
if: (!cancelled())
304296
run: |
305297
lsblk -f
306298
echo -e "\n"
@@ -383,7 +375,7 @@ jobs:
383375

384376
- name: Package OpenWrt Firmware
385377
if: steps.download.outputs.status == 'success'
386-
uses: unifreq/openwrt_packit@master
378+
uses: ophub/flippy-openwrt-actions@main
387379
env:
388380
OPENWRT_ARMVIRT: openwrt-armvirt/*rootfs.tar.gz
389381
PACKAGE_SOC: all

‎.github/workflows/Delete-Old-Workflows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Delete Old Workflows
14-
uses: GitRML/delete-workflow-runs@main
14+
uses: Mattraks/delete-workflow-runs@main
1515
with:
1616
token: ${{ secrets.GITHUB_TOKEN }}
1717
retain_days: 7

‎.github/workflows/RaspberryPi3-OpenWrt.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
#===============================================
2-
# Description: Build OpenWrt
3-
# File name: build-openwrt.yml
4-
# Lisence: MIT
5-
# Author: P3TERX
6-
# https://github.com/P3TERX
7-
#===============================================
8-
91
name: RaspberryPi3 OpenWrt
102

113
on:
@@ -180,7 +172,7 @@ jobs:
180172
run: |
181173
echo "警告⚠"
182174
echo "分配的服务器性能有限，若选择的插件过多，务必注意CPU性能！"
183-
echo -e "已知CPU型号（降序）：8370C，8272CL，8171M，E5-2673 \n"
175+
echo -e "已知CPU型号（降序）：7763，8370C，8272CL，8171M，E5-2673 \n"
184176
echo "--------------------------CPU信息--------------------------"
185177
echo "CPU物理数量：$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
186178
echo -e "CPU核心信息：$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c) \n"
@@ -196,7 +188,7 @@ jobs:
196188
run: |
197189
docker rmi $(docker images -q)
198190
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android
199-
sudo -E apt-get -y purge azure-cli* docker* ghc* zulu* llvm* firefox* google* dotnet* powershell* openjdk* mysql* php* mongodb* moby* snap* aspnetcore*
191+
sudo -E apt-get -y purge azure-cli* docker* ghc* zulu* llvm* firefox* google* dotnet* powershell* openjdk* mysql* php* mongodb* snap* aspnetcore*
200192
sudo -E apt-get -qq update
201193
sudo -E apt-get -y install libfuse-dev $(curl -fsSL is.gd/depends_ubuntu_2204)
202194
sudo -E apt-get -qq autoremove --purge
@@ -267,6 +259,7 @@ jobs:
267259
$GITHUB_WORKSPACE/$DIY_SCRIPT
268260
$GITHUB_WORKSPACE/scripts/preset-clash-core.sh $CLASH_KERNEL
269261
$GITHUB_WORKSPACE/scripts/preset-terminal-tools.sh
262+
$GITHUB_WORKSPACE/scripts/preset-adguard-core.sh $CLASH_KERNEL
270263

271264
- name: Download DL Package
272265
run: |
@@ -301,7 +294,7 @@ jobs:
301294
echo "FILE_DATE=$(date +"%Y.%m.%d")" >> $GITHUB_ENV
302295

303296
- name: Check Space Usage
304-
if: always()
297+
if: (!cancelled())
305298
run: |
306299
lsblk -f
307300
echo -e "\n"

‎.github/workflows/RaspberryPi4-OpenWrt.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
#===============================================
2-
# Description: Build OpenWrt
3-
# File name: build-openwrt.yml
4-
# Lisence: MIT
5-
# Author: P3TERX
6-
# https://github.com/P3TERX
7-
#===============================================
8-
91
name: RaspberryPi4 OpenWrt
102

113
on:
@@ -180,7 +172,7 @@ jobs:
180172
run: |
181173
echo "警告⚠"
182174
echo "分配的服务器性能有限，若选择的插件过多，务必注意CPU性能！"
183-
echo -e "已知CPU型号（降序）：8370C，8272CL，8171M，E5-2673 \n"
175+
echo -e "已知CPU型号（降序）：7763，8370C，8272CL，8171M，E5-2673 \n"
184176
echo "--------------------------CPU信息--------------------------"
185177
echo "CPU物理数量：$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
186178
echo -e "CPU核心信息：$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c) \n"
@@ -196,7 +188,7 @@ jobs:
196188
run: |
197189
docker rmi $(docker images -q)
198190
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android
199-
sudo -E apt-get -y purge azure-cli* docker* ghc* zulu* llvm* firefox* google* dotnet* powershell* openjdk* mysql* php* mongodb* moby* snap* aspnetcore*
191+
sudo -E apt-get -y purge azure-cli* docker* ghc* zulu* llvm* firefox* google* dotnet* powershell* openjdk* mysql* php* mongodb* snap* aspnetcore*
200192
sudo -E apt-get -qq update
201193
sudo -E apt-get -y install libfuse-dev $(curl -fsSL is.gd/depends_ubuntu_2204)
202194
sudo -E apt-get -qq autoremove --purge
@@ -267,6 +259,7 @@ jobs:
267259
$GITHUB_WORKSPACE/$DIY_SCRIPT
268260
$GITHUB_WORKSPACE/scripts/preset-clash-core.sh $CLASH_KERNEL
269261
$GITHUB_WORKSPACE/scripts/preset-terminal-tools.sh
262+
$GITHUB_WORKSPACE/scripts/preset-adguard-core.sh $CLASH_KERNEL
270263

271264
- name: Download DL Package
272265
run: |
@@ -301,7 +294,7 @@ jobs:
301294
echo "FILE_DATE=$(date +"%Y.%m.%d")" >> $GITHUB_ENV
302295

303296
- name: Check Space Usage
304-
if: always()
297+
if: (!cancelled())
305298
run: |
306299
lsblk -f
307300
echo -e "\n"

‎.github/workflows/Rockchip-OpenWrt.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
#===============================================
2-
# Description: Build OpenWrt
3-
# File name: build-openwrt.yml
4-
# Lisence: MIT
5-
# Author: P3TERX
6-
# https://github.com/P3TERX
7-
#===============================================
8-
91
name: Rockchip OpenWrt
102

113
on:
@@ -181,7 +173,7 @@ jobs:
181173
run: |
182174
echo "警告⚠"
183175
echo "分配的服务器性能有限，若选择的插件过多，务必注意CPU性能！"
184-
echo -e "已知CPU型号（降序）：8370C，8272CL，8171M，E5-2673 \n"
176+
echo -e "已知CPU型号（降序）：7763，8370C，8272CL，8171M，E5-2673 \n"
185177
echo "--------------------------CPU信息--------------------------"
186178
echo "CPU物理数量：$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
187179
echo -e "CPU核心信息：$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c) \n"
@@ -197,7 +189,7 @@ jobs:
197189
run: |
198190
docker rmi $(docker images -q)
199191
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android
200-
sudo -E apt-get -y purge azure-cli* docker* ghc* zulu* llvm* firefox* google* dotnet* powershell* openjdk* mysql* php* mongodb* moby* snap* aspnetcore*
192+
sudo -E apt-get -y purge azure-cli* docker* ghc* zulu* llvm* firefox* google* dotnet* powershell* openjdk* mysql* php* mongodb* snap* aspnetcore*
201193
sudo -E apt-get -qq update
202194
sudo -E apt-get -y install libfuse-dev $(curl -fsSL is.gd/depends_ubuntu_2204)
203195
sudo -E apt-get -qq autoremove --purge
@@ -268,6 +260,7 @@ jobs:
268260
$GITHUB_WORKSPACE/$DIY_SCRIPT
269261
$GITHUB_WORKSPACE/scripts/preset-clash-core.sh $CLASH_KERNEL
270262
$GITHUB_WORKSPACE/scripts/preset-terminal-tools.sh
263+
$GITHUB_WORKSPACE/scripts/preset-adguard-core.sh $CLASH_KERNEL
271264

272265
- name: Download DL Package
273266
run: |
@@ -302,7 +295,7 @@ jobs:
302295
echo "FILE_DATE=$(date +"%Y.%m.%d")" >> $GITHUB_ENV
303296

304297
- name: Check Space Usage
305-
if: always()
298+
if: (!cancelled())
306299
run: |
307300
lsblk -f
308301
echo -e "\n"

‎.github/workflows/X86_64-Mini-OpenWrt.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
#===============================================
2-
# Description: Build OpenWrt
3-
# File name: build-openwrt.yml
4-
# Lisence: MIT
5-
# Author: P3TERX
6-
# https://github.com/P3TERX
7-
#===============================================
8-
91
name: X86_64 Mini OpenWrt
102

113
on:
@@ -36,7 +28,7 @@ jobs:
3628
run: |
3729
echo "警告⚠"
3830
echo "分配的服务器性能有限，若选择的插件过多，务必注意CPU性能！"
39-
echo -e "已知CPU型号（降序）：8370C，8272CL，8171M，E5-2673 \n"
31+
echo -e "已知CPU型号（降序）：7763，8370C，8272CL，8171M，E5-2673 \n"
4032
echo "--------------------------CPU信息--------------------------"
4133
echo "CPU物理数量：$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
4234
echo -e "CPU核心信息：$(cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c) \n"
@@ -84,6 +76,7 @@ jobs:
8476
$GITHUB_WORKSPACE/$DIY_SCRIPT
8577
$GITHUB_WORKSPACE/scripts/preset-clash-core.sh $CLASH_KERNEL
8678
$GITHUB_WORKSPACE/scripts/preset-terminal-tools.sh
79+
$GITHUB_WORKSPACE/scripts/preset-adguard-core.sh $CLASH_KERNEL
8780

8881
- name: Download DL Package
8982
run: |
@@ -127,7 +120,7 @@ jobs:
127120
echo "FILE_DATE=$(date +"%Y.%m.%d")" >> $GITHUB_ENV
128121

129122
- name: Check Space Usage
130-
if: always()
123+
if: (!cancelled())
131124
run: df -hT
132125

133126
- name: Upload Bin Directory

0 commit comments

Comments
 (0)