Skip to content
This repository was archived by the owner on Feb 19, 2024. It is now read-only.

Commit 77548e3

Browse files
haiibohaiibo
committed
优化并删除无用代码
1 parent 19f586b commit 77548e3

11 files changed

+101
-96
lines changed

‎.github/workflows/ARMv8_Mini-OpenWrt.yml renamed to ‎.github/workflows/ARMv8-Mini-OpenWrt.yml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@
66
# https://github.com/P3TERX
77
#===============================================
88

9-
name: ARMv8_Mini OpenWrt
9+
name: ARMv8 Mini OpenWrt
1010

1111
on:
12-
repository_dispatch:
1312
workflow_dispatch:
1413
schedule:
15-
- cron: '0 0 * * *'
14+
- cron: '0 23 * * *'
1615

1716
env:
1817
REPO_URL: https://github.com/coolsnowwolf/lede
1918
REPO_BRANCH: master
20-
CONFIG_FILE: configs/armv8_mini.config
19+
CONFIG_FILE: configs/armv8-mini.config
2120
DIY_SCRIPT: diy-mini.sh
2221
UPLOAD_BIN_DIR: false
2322
UPLOAD_FIRMWARE: false
@@ -39,16 +38,14 @@ jobs:
3938
DEBIAN_FRONTEND: noninteractive
4039
run: |
4140
docker rmi $(docker images -q)
42-
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android /opt/ghc
43-
sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* || true
41+
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
4442
sudo -E apt-get -qq update
45-
sudo -E apt-get -qq install $(curl -fsSL https://is.gd/depends_ubuntu_2204)
43+
sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204)
4644
sudo -E apt-get -qq autoremove --purge
4745
sudo -E apt-get -qq clean
4846
sudo timedatectl set-timezone "$TZ"
4947
sudo mkdir -p /workdir
5048
sudo chown $USER:$GROUPS /workdir
51-
df -Th
5249
5350
- name: Clone source code
5451
working-directory: /workdir
@@ -96,8 +93,7 @@ jobs:
9693
echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
9794
9895
- name: Check space usage
99-
if: (!cancelled())
100-
run: df -Th
96+
run: df -hT
10197

10298
- name: Upload bin directory
10399
uses: actions/upload-artifact@main
@@ -108,7 +104,7 @@ jobs:
108104

109105
- name: Organize files
110106
id: organize
111-
if: steps.compile.outputs.status == 'success' && !cancelled()
107+
if: steps.compile.outputs.status == 'success'
112108
run: |
113109
cp openwrt/.config build.config
114110
mkdir -p Packages
@@ -124,14 +120,14 @@ jobs:
124120
125121
- name: Upload firmware directory
126122
uses: actions/upload-artifact@main
127-
if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled()
123+
if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true'
128124
with:
129125
name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}
130126
path: ${{ env.FIRMWARE }}
131127

132128
- name: Upload firmware to release
133-
uses: ncipollo/release-action@v1
134-
if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled()
129+
uses: ncipollo/release-action@main
130+
if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true'
135131
with:
136132
name: R${{ env.DATE }} for ${{ env.FILE_NAME }}
137133
artifacts: ${{ env.FIRMWARE }}/*
@@ -147,7 +143,7 @@ jobs:
147143
148144
- name: Package armvirt as openwrt
149145
uses: unifreq/openwrt_packit@master
150-
if: steps.organize.outputs.status == 'success' && !cancelled()
146+
if: steps.organize.outputs.status == 'success'
151147
env:
152148
OPENWRT_ARMVIRT: lean/*/*/*rootfs.tar.gz
153149
PACKAGE_SOC: all
@@ -156,9 +152,15 @@ jobs:
156152
KERNEL_AUTO_LATEST: true
157153
GZIP_IMGS: .gz
158154

155+
- name: Upload openwrt to actions
156+
uses: kittaakos/upload-artifact-as-is@master
157+
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true'
158+
with:
159+
path: ${{ env.PACKAGED_OUTPUTPATH }}
160+
159161
- name: Upload openwrt to release
160-
uses: ncipollo/release-action@v1
161-
if: env.PACKAGED_STATUS == 'success' && !cancelled()
162+
uses: ncipollo/release-action@main
163+
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true'
162164
with:
163165
name: R${{ env.DATE }} for ${{ env.PRODUCT_NAME }}
164166
artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/*

‎.github/workflows/ARMv8-Package.yml

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
name: ARMv8 Package
1010

1111
on:
12-
repository_dispatch:
1312
workflow_dispatch:
1413
schedule:
1514
- cron: '0 15 * * *'
@@ -42,7 +41,7 @@ jobs:
4241
run: |
4342
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
4443
sudo -E apt-get -qq update
45-
sudo -E apt-get -qq install $(curl -fsSL https://is.gd/depends_ubuntu_2204)
44+
sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204)
4645
sudo -E apt-get -qq autoremove --purge
4746
sudo -E apt-get -qq clean
4847
sudo timedatectl set-timezone "$TZ"
@@ -60,25 +59,34 @@ jobs:
6059
echo "useVersionInfo=$useVersionInfo" >> $GITHUB_ENV
6160
echo "DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV
6261
62+
- name: Download armvirt firmware
63+
id: download
64+
run: |
65+
mkdir -p openwrt/bin/targets/armvirt/64
66+
cd openwrt/bin/targets/armvirt/64
67+
wget -q https://github.com/${GITHUB_REPOSITORY}/releases/download/ROOTFS_${{ env.VERSION }}/openwrt-armvirt-64-default-rootfs.tar.gz
68+
echo "::set-output name=status::success"
69+
6370
- name: Package armvirt as openwrt
6471
uses: ophub/flippy-openwrt-actions@main
72+
if: steps.download.outputs.status == 'success'
6573
env:
66-
OPENWRT_ARMVIRT: https://github.com/haiibo/OpenWrt/releases/download/ROOTFS_${{ env.VERSION }}/openwrt-armvirt-64-default-rootfs.tar.gz
74+
OPENWRT_ARMVIRT: openwrt/bin/targets/*/*/*rootfs.tar.gz
6775
PACKAGE_SOC: all
6876
KERNEL_REPO_URL: https://github.com/ophub/kernel/tree/main/pub/stable
6977
KERNEL_VERSION_NAME: 5.15.13_5.19.1
7078
KERNEL_AUTO_LATEST: true
7179
GZIP_IMGS: .gz
7280

73-
- name: Upload artifact to actions
81+
- name: Upload openwrt to actions
7482
uses: kittaakos/upload-artifact-as-is@master
75-
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled()
83+
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true'
7684
with:
7785
path: ${{ env.PACKAGED_OUTPUTPATH }}
7886

7987
- name: Upload openwrt to release
80-
uses: ncipollo/release-action@v1
81-
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled()
88+
uses: ncipollo/release-action@main
89+
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true'
8290
with:
8391
name: R${{ env.DATE }} for ARMv8_${{ env.VERSION }}
8492
artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/*
@@ -96,7 +104,7 @@ jobs:
96104
${{ env.useVersionInfo }}
97105
98106
Package-for-Plus:
99-
runs-on: ubuntu-20.04
107+
runs-on: ubuntu-22.04
100108
if: github.event.repository.owner.id == github.event.sender.id
101109

102110
env:
@@ -113,7 +121,7 @@ jobs:
113121
run: |
114122
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
115123
sudo -E apt-get -qq update
116-
sudo -E apt-get -qq install $(curl -fsSL git.io/depends-ubuntu-2004)
124+
sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204)
117125
sudo -E apt-get -qq autoremove --purge
118126
sudo -E apt-get -qq clean
119127
sudo timedatectl set-timezone "$TZ"
@@ -131,25 +139,34 @@ jobs:
131139
echo "useVersionInfo=$useVersionInfo" >> $GITHUB_ENV
132140
echo "DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV
133141
142+
- name: Download armvirt firmware
143+
id: download
144+
run: |
145+
mkdir -p openwrt/bin/targets/armvirt/64
146+
cd openwrt/bin/targets/armvirt/64
147+
wget -q https://github.com/${GITHUB_REPOSITORY}/releases/download/ROOTFS_${{ env.VERSION }}/openwrt-armvirt-64-default-rootfs.tar.gz
148+
echo "::set-output name=status::success"
149+
134150
- name: Package armvirt as openwrt
135151
uses: ophub/flippy-openwrt-actions@main
152+
if: steps.download.outputs.status == 'success'
136153
env:
137-
OPENWRT_ARMVIRT: https://github.com/haiibo/OpenWrt/releases/download/ROOTFS_${{ env.VERSION }}/openwrt-armvirt-64-default-rootfs.tar.gz
154+
OPENWRT_ARMVIRT: openwrt/bin/targets/*/*/*rootfs.tar.gz
138155
PACKAGE_SOC: all
139156
KERNEL_REPO_URL: https://github.com/ophub/kernel/tree/main/pub/stable
140157
KERNEL_VERSION_NAME: 5.15.13_5.19.1
141158
KERNEL_AUTO_LATEST: true
142159
GZIP_IMGS: .gz
143160

144-
- name: Upload artifact to actions
161+
- name: Upload openwrt to actions
145162
uses: kittaakos/upload-artifact-as-is@master
146-
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled()
163+
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true'
147164
with:
148165
path: ${{ env.PACKAGED_OUTPUTPATH }}
149166

150167
- name: Upload openwrt to release
151-
uses: ncipollo/release-action@v1
152-
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled()
168+
uses: ncipollo/release-action@main
169+
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true'
153170
with:
154171
name: R${{ env.DATE }} for ARMv8_${{ env.VERSION }}
155172
artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/*

‎.github/workflows/ARMv8_Plus-OpenWrt.yml renamed to ‎.github/workflows/ARMv8-Plus-OpenWrt.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@
66
# https://github.com/P3TERX
77
#===============================================
88

9-
name: ARMv8_Plus OpenWrt
9+
name: ARMv8 Plus OpenWrt
1010

1111
on:
12-
repository_dispatch:
1312
workflow_dispatch:
1413
schedule:
1514
- cron: '0 21 * * *'
1615

1716
env:
1817
REPO_URL: https://github.com/coolsnowwolf/lede
1918
REPO_BRANCH: master
20-
CONFIG_FILE: configs/armv8_plus.config
19+
CONFIG_FILE: configs/armv8-plus.config
2120
DIY_SCRIPT: diy-script.sh
2221
UPLOAD_BIN_DIR: false
2322
UPLOAD_FIRMWARE: false
@@ -39,16 +38,14 @@ jobs:
3938
DEBIAN_FRONTEND: noninteractive
4039
run: |
4140
docker rmi $(docker images -q)
42-
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android /opt/ghc
43-
sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* || true
41+
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
4442
sudo -E apt-get -qq update
45-
sudo -E apt-get -qq install $(curl -fsSL https://is.gd/depends_ubuntu_2204)
43+
sudo -E apt-get -qq install $(curl -fsSL is.gd/depends_ubuntu_2204)
4644
sudo -E apt-get -qq autoremove --purge
4745
sudo -E apt-get -qq clean
4846
sudo timedatectl set-timezone "$TZ"
4947
sudo mkdir -p /workdir
5048
sudo chown $USER:$GROUPS /workdir
51-
df -Th
5249
5350
- name: Clone source code
5451
working-directory: /workdir
@@ -96,8 +93,7 @@ jobs:
9693
echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
9794
9895
- name: Check space usage
99-
if: (!cancelled())
100-
run: df -Th
96+
run: df -hT
10197

10298
- name: Upload bin directory
10399
uses: actions/upload-artifact@main
@@ -108,7 +104,7 @@ jobs:
108104

109105
- name: Organize files
110106
id: organize
111-
if: steps.compile.outputs.status == 'success' && !cancelled()
107+
if: steps.compile.outputs.status == 'success'
112108
run: |
113109
cp openwrt/.config build.config
114110
mkdir -p Packages
@@ -124,14 +120,14 @@ jobs:
124120
125121
- name: Upload firmware directory
126122
uses: actions/upload-artifact@main
127-
if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true' && !cancelled()
123+
if: steps.organize.outputs.status == 'success' && env.UPLOAD_FIRMWARE == 'true'
128124
with:
129125
name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }}
130126
path: ${{ env.FIRMWARE }}
131127

132128
- name: Upload firmware to release
133-
uses: ncipollo/release-action@v1
134-
if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled()
129+
uses: ncipollo/release-action@main
130+
if: steps.organize.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true'
135131
with:
136132
name: R${{ env.DATE }} for ${{ env.FILE_NAME }}
137133
artifacts: ${{ env.FIRMWARE }}/*
@@ -147,7 +143,7 @@ jobs:
147143
148144
- name: Package armvirt as openwrt
149145
uses: unifreq/openwrt_packit@master
150-
if: steps.organize.outputs.status == 'success' && !cancelled()
146+
if: steps.organize.outputs.status == 'success'
151147
env:
152148
OPENWRT_ARMVIRT: lean/*/*/*rootfs.tar.gz
153149
PACKAGE_SOC: all
@@ -156,9 +152,15 @@ jobs:
156152
KERNEL_AUTO_LATEST: true
157153
GZIP_IMGS: .gz
158154

155+
- name: Upload openwrt to actions
156+
uses: kittaakos/upload-artifact-as-is@master
157+
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_FIRMWARE == 'true'
158+
with:
159+
path: ${{ env.PACKAGED_OUTPUTPATH }}
160+
159161
- name: Upload openwrt to release
160-
uses: ncipollo/release-action@v1
161-
if: env.PACKAGED_STATUS == 'success' && !cancelled()
162+
uses: ncipollo/release-action@main
163+
if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true'
162164
with:
163165
name: R${{ env.DATE }} for ${{ env.PRODUCT_NAME }}
164166
artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/*

‎.github/workflows/Delete-Older-Artifacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Delete Older Artifacts
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '0 2 * * *'
6+
- cron: '0 3 * * *'
77

88
jobs:
99
Cleaning:
@@ -14,7 +14,7 @@ jobs:
1414
uses: GitRML/delete-workflow-runs@main
1515
with:
1616
token: ${{ secrets.GITHUB_TOKEN }}
17-
retain_days: 3
17+
retain_days: 7
1818
keep_minimum_runs: 0
1919

2020
- name: Delete Older Releases

0 commit comments

Comments
 (0)