Skip to content

Commit 7a9ea92

Browse files
sbwmlsbwml
committed
drop nanopi-r5s GPT version
1 parent be48aea commit 7a9ea92

File tree

2 files changed

+5
-50
lines changed

2 files changed

+5
-50
lines changed

‎.github/workflows/build-release.yml

+3-26
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
matrix:
1515
model:
1616
- nanopi-r4s
17-
- nanopi-r5s-mainline
17+
- nanopi-r5s
1818
- x86_64
1919
tag:
2020
- type: stable
2121
version: openwrt-21.02
2222
- type: rc
2323
version: openwrt-22.03
2424
exclude:
25-
- { model: nanopi-r5s-mainline, tag: { type: stable, version: openwrt-21.02 } }
25+
- { model: nanopi-r5s, tag: { type: stable, version: openwrt-21.02 } }
2626

2727
steps:
2828
- name: Checkout
@@ -39,7 +39,7 @@ jobs:
3939
4040
- name: Set release env
4141
run: |
42-
if [[ ${{ matrix.model }} == "nanopi-r5s" ]]; then
42+
if [[ ${{ matrix.model }} == "null" ]]; then
4343
echo "release=false" >> "$GITHUB_ENV"
4444
fi
4545
@@ -83,8 +83,6 @@ jobs:
8383
id: compileopenwrt
8484
run: |
8585
if [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
86-
bash <(curl -sS ${{ secrets.script_url_nanopi_r5s }}) ${{ matrix.tag.type }}
87-
elif [ "${{ matrix.model }}" = "nanopi-r5s-mainline" ]; then
8886
bash <(curl -sS ${{ secrets.script_url_general }}) ${{ matrix.tag.type }} r5s
8987
elif [ "${{ matrix.model }}" = "x86_64" ]; then
9088
bash <(curl -sS ${{ secrets.script_url_general }}) ${{ matrix.tag.type }} x86
@@ -105,11 +103,6 @@ jobs:
105103
cp -a openwrt/bin/targets/rockchip/armv8/config.buildinfo info/config.buildinfo
106104
cd rom && sha256sum *gz > ../info/sha256sums.txt
107105
elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
108-
cp -a rk356x_tools/out/*.gz rom/
109-
cp -a rk356x_tools/out/*.zip rom/
110-
cp -a rk356x_tools/out/*.txt info/
111-
cp -a rk356x_tools/out/*.buildinfo info/
112-
elif [ "${{ matrix.model }}" = "nanopi-r5s-mainline" ]; then
113106
cp -a openwrt/bin/targets/rockchip/armv8/*.img.gz rom/
114107
cp -a openwrt/bin/targets/rockchip/armv8/*-r5s.manifest info/manifest.txt
115108
cp -a openwrt/bin/targets/rockchip/armv8/config.buildinfo info/config.buildinfo
@@ -156,13 +149,6 @@ jobs:
156149
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r4s-ext4-sysupgrade.img.gz openwrt/hash/ || true
157150
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r4s-squashfs-sysupgrade.img.gz openwrt/hash/ || true
158151
elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
159-
proxychains -q aliyundrive upload --retry 10 -f info/manifest.txt openwrt/hash/ || true
160-
proxychains -q aliyundrive upload --retry 10 -f info/config.buildinfo openwrt/hash/ || true
161-
proxychains -q aliyundrive upload --retry 10 -f info/sha256sums.txt openwrt/hash/ || true
162-
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-emmc.img.zip openwrt/hash/ || true
163-
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-squashfs-sysupgrade.img.gz openwrt/hash/ || true
164-
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-ext4-sysupgrade.img.gz openwrt/hash/ || true
165-
elif [ "${{ matrix.model }}" = "nanopi-r5s-mainline" ]; then
166152
proxychains -q aliyundrive upload --retry 10 -f info/manifest.txt openwrt/hash/ || true
167153
proxychains -q aliyundrive upload --retry 10 -f info/config.buildinfo openwrt/hash/ || true
168154
proxychains -q aliyundrive upload --retry 10 -f info/sha256sums.txt openwrt/hash/ || true
@@ -189,15 +175,6 @@ jobs:
189175
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r4s-ext4-sysupgrade.img.gz openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/ || true
190176
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r4s-squashfs-sysupgrade.img.gz openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/ || true
191177
elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
192-
version=$(cat openwrt/version.txt)
193-
proxychains -q aliyundrive mkdir openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version
194-
proxychains -q aliyundrive upload --retry 10 -f info/manifest.txt openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/ || true
195-
proxychains -q aliyundrive upload --retry 10 -f info/config.buildinfo openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/ || true
196-
proxychains -q aliyundrive upload --retry 10 -f info/sha256sums.txt openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/ || true
197-
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-emmc.img.zip openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/ || true
198-
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/ || true
199-
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/ || true
200-
elif [ "${{ matrix.model }}" = "nanopi-r5s-mainline" ]; then
201178
version=$(cat openwrt/version.txt)
202179
proxychains -q aliyundrive mkdir openwrt/nanopi-r5s/mainline/releases/${{ matrix.tag.version }}/$version
203180
proxychains -q aliyundrive upload --retry 10 -f info/manifest.txt openwrt/nanopi-r5s/mainline/releases/${{ matrix.tag.version }}/$version/ || true

‎.github/workflows/build-snapshots.yml

+2-24
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
matrix:
1414
model:
1515
- nanopi-r4s
16-
- nanopi-r5s-mainline
16+
- nanopi-r5s
1717
- x86_64
1818
tag:
1919
- type: dev
2020
version: openwrt-21.02
2121
- type: dev2
2222
version: openwrt-22.03
2323
exclude:
24-
- { model: nanopi-r5s-mainline, tag: { type: dev, version: openwrt-21.02 } }
24+
- { model: nanopi-r5s, tag: { type: dev, version: openwrt-21.02 } }
2525

2626
steps:
2727
- name: Checkout
@@ -76,8 +76,6 @@ jobs:
7676
id: compileopenwrt
7777
run: |
7878
if [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
79-
bash <(curl -sS ${{ secrets.script_url_nanopi_r5s }}) ${{ matrix.tag.type }}
80-
elif [ "${{ matrix.model }}" = "nanopi-r5s-mainline" ]; then
8179
bash <(curl -sS ${{ secrets.script_url_general }}) ${{ matrix.tag.type }} r5s
8280
elif [ "${{ matrix.model }}" = "x86_64" ]; then
8381
bash <(curl -sS ${{ secrets.script_url_general }}) ${{ matrix.tag.type }} x86
@@ -97,11 +95,6 @@ jobs:
9795
cp -a openwrt/bin/targets/rockchip/armv8/config.buildinfo info/config.buildinfo
9896
cd rom && sha256sum *gz > ../info/sha256sums.txt
9997
elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
100-
cp -a rk356x_tools/out/*.gz rom/
101-
cp -a rk356x_tools/out/*.zip rom/
102-
cp -a rk356x_tools/out/*.txt info/
103-
cp -a rk356x_tools/out/*.buildinfo info/
104-
elif [ "${{ matrix.model }}" = "nanopi-r5s-mainline" ]; then
10598
cp -a openwrt/bin/targets/rockchip/armv8/*.img.gz rom/
10699
cp -a openwrt/bin/targets/rockchip/armv8/*-r5s.manifest info/manifest.txt
107100
cp -a openwrt/bin/targets/rockchip/armv8/config.buildinfo info/config.buildinfo
@@ -141,13 +134,6 @@ jobs:
141134
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r4s-ext4-sysupgrade.img.gz openwrt/hash/ || true
142135
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r4s-squashfs-sysupgrade.img.gz openwrt/hash/ || true
143136
elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
144-
proxychains -q aliyundrive upload --retry 10 -f info/manifest.txt openwrt/hash/ || true
145-
proxychains -q aliyundrive upload --retry 10 -f info/config.buildinfo openwrt/hash/ || true
146-
proxychains -q aliyundrive upload --retry 10 -f info/sha256sums.txt openwrt/hash/ || true
147-
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-emmc.img.zip openwrt/hash/ || true
148-
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-squashfs-sysupgrade.img.gz openwrt/hash/ || true
149-
timeout 20m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-ext4-sysupgrade.img.gz openwrt/hash/ || true
150-
elif [ "${{ matrix.model }}" = "nanopi-r5s-mainline" ]; then
151137
proxychains -q aliyundrive upload --retry 10 -f info/manifest.txt openwrt/hash/ || true
152138
proxychains -q aliyundrive upload --retry 10 -f info/config.buildinfo openwrt/hash/ || true
153139
proxychains -q aliyundrive upload --retry 10 -f info/sha256sums.txt openwrt/hash/ || true
@@ -180,14 +166,6 @@ jobs:
180166
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r4s-ext4-sysupgrade.img.gz openwrt/nanopi-r4s/snapshots/$branch/$DATE/ || true
181167
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r4s-squashfs-sysupgrade.img.gz openwrt/nanopi-r4s/snapshots/$branch/$DATE/ || true
182168
elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
183-
proxychains -q aliyundrive mkdir openwrt/nanopi-r5s/snapshots/$branch/$DATE
184-
proxychains -q aliyundrive upload -f info/manifest.txt openwrt/nanopi-r5s/snapshots/$branch/$DATE/ || true
185-
proxychains -q aliyundrive upload -f info/config.buildinfo openwrt/nanopi-r5s/snapshots/$branch/$DATE/ || true
186-
proxychains -q aliyundrive upload -f info/sha256sums.txt openwrt/nanopi-r5s/snapshots/$branch/$DATE/ || true
187-
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-emmc.img.zip openwrt/nanopi-r5s/snapshots/$branch/$DATE/ || true
188-
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/ || true
189-
timeout 15m proxychains -q aliyundrive upload --retry 10 -f rom/*-r5s-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/ || true
190-
elif [ "${{ matrix.model }}" = "nanopi-r5s-mainline" ]; then
191169
proxychains -q aliyundrive mkdir openwrt/nanopi-r5s/mainline/snapshots/$branch/$DATE
192170
proxychains -q aliyundrive upload --retry 10 -f info/manifest.txt openwrt/nanopi-r5s/mainline/snapshots/$branch/$DATE/ || true
193171
proxychains -q aliyundrive upload --retry 10 -f info/config.buildinfo openwrt/nanopi-r5s/mainline/snapshots/$branch/$DATE/ || true

0 commit comments

Comments
 (0)