Skip to content

Commit 6a886bc

Browse files
sbwmlsbwml
committed
aliyunpan: retry using a private server
1 parent ad41b53 commit 6a886bc

File tree

2 files changed

+11
-106
lines changed

2 files changed

+11
-106
lines changed

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

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ jobs:
6666
env:
6767
DEBIAN_FRONTEND: noninteractive
6868
run: |
69-
sudo sh -c 'echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" >> /etc/apt/sources.list'
70-
sudo sh -c 'echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" >> /etc/apt/sources.list'
69+
sudo sh -c 'echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main" >> /etc/apt/sources.list'
70+
sudo sh -c 'echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main" >> /etc/apt/sources.list'
7171
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
7272
sudo apt-get update
73-
sudo apt-get install -y build-essential flex bison clang-15 cmake g++ gawk gcc-multilib g++-multilib gettext git libfuse-dev libncurses5-dev libssl-dev python3 python3-pip python3-ply python3-distutils python3-pyelftools rsync unzip zlib1g-dev file wget subversion patch upx-ucl autoconf automake curl asciidoc binutils bzip2 lib32gcc-s1 libc6-dev-i386 uglifyjs msmtp texinfo libreadline-dev libglib2.0-dev xmlto libelf-dev libtool autopoint antlr3 gperf ccache swig coreutils haveged scons libpython3-dev rename qemu-utils
73+
sudo apt-get install -y build-essential flex bison clang-17 cmake g++ gawk gcc-multilib g++-multilib gettext git libfuse-dev libncurses5-dev libssl-dev python3 python3-pip python3-ply python3-distutils python3-pyelftools rsync unzip zlib1g-dev file wget subversion patch upx-ucl autoconf automake curl asciidoc binutils bzip2 lib32gcc-s1 libc6-dev-i386 uglifyjs msmtp texinfo libreadline-dev libglib2.0-dev xmlto libelf-dev libtool autopoint antlr3 gperf ccache swig coreutils haveged scons libpython3-dev rename qemu-utils
7474
sudo apt-get clean
7575
git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
7676
df -Th
@@ -125,7 +125,7 @@ jobs:
125125
- name: Create release
126126
uses: ncipollo/release-action@v1.11.1
127127
with:
128-
name: OpenWRT-${{ env.latest_release }}
128+
name: OpenWrt-${{ env.latest_release }}
129129
allowUpdates: true
130130
tag: ${{ env.latest_release }}
131131
commit: master
@@ -137,7 +137,7 @@ jobs:
137137
if: env.release_kmod == 'true'
138138
uses: ncipollo/release-action@v1.11.1
139139
with:
140-
name: OpenWRT-${{ env.latest_release }}
140+
name: OpenWrt-${{ env.latest_release }}
141141
allowUpdates: true
142142
tag: ${{ env.latest_release }}
143143
commit: master
@@ -158,7 +158,7 @@ jobs:
158158
if: ${{ matrix.model == 'x86_64' }}
159159
uses: ncipollo/release-action@v1.11.1
160160
with:
161-
name: OpenWRT-${{ env.latest_release }}
161+
name: OpenWrt-${{ env.latest_release }}
162162
allowUpdates: true
163163
tag: ${{ env.latest_release }}
164164
commit: master
@@ -167,7 +167,6 @@ jobs:
167167
artifacts: ${{ env.WORKDIR }}/virtual_images/*-generic-squashfs-combined-efi*
168168

169169
- name: Install aliyunpan & login
170-
id: login
171170
continue-on-error: true
172171
run: |
173172
if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
@@ -182,23 +181,9 @@ jobs:
182181
export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
183182
aliyun_token=`curl -s ${{ secrets.aliyun_token }} | openssl enc -aes-256-cfb -pbkdf2 -a -d -k ${{ secrets.token_dec }}`
184183
aliyunpan config set -device_id=$device_id >/dev/null 2>&1
185-
check_status() (
186-
curl -I -4 -m 5 -o /dev/null -s -w %{http_code} https://auth.aliyundrive.com/v2/account/token
187-
)
188-
while [[ "$(check_status)" -ne 405 ]]
189-
do
190-
check_status
191-
done
192184
echo
193185
echo $aliyun_token | aliyunpan login
194186
195-
- name: Retry login aliyunpan
196-
if: steps.login.outcome == 'failure'
197-
run: |
198-
export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
199-
aliyun_token=`curl -s ${{ secrets.aliyun_token }} | openssl enc -aes-256-cfb -pbkdf2 -a -d -k ${{ secrets.token_dec }}`
200-
echo $aliyun_token | aliyunpan login
201-
202187
- name: Upload Firmware - releases
203188
id: upload
204189
continue-on-error: true
@@ -239,36 +224,5 @@ jobs:
239224
- name: Retry Upload Firmware - releases
240225
if: steps.upload.outcome == 'failure'
241226
run: |
242-
export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
243-
version=$(cat openwrt/version.txt)
244-
aliyunpan token update
245-
if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
246-
aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
247-
aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
248-
aliyunpan upload -ow info/sha256sums.txt openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
249-
aliyunpan upload -ow rom/*-r4s-ext4-sysupgrade.img.gz openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
250-
aliyunpan upload -ow rom/*-r4s-squashfs-sysupgrade.img.gz openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
251-
elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
252-
aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
253-
aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
254-
aliyunpan upload -ow info/sha256sums.txt openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
255-
aliyunpan upload -ow rom/nanopi-*.tar.xz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
256-
aliyunpan upload -ow rom/*-r5c-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
257-
aliyunpan upload -ow rom/*-r5c-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
258-
aliyunpan upload -ow rom/*-r5s-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
259-
aliyunpan upload -ow rom/*-r5s-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
260-
elif [ "${{ matrix.model }}" = "x86_64" ]; then
261-
aliyunpan upload -ow info/manifest.txt openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
262-
aliyunpan upload -ow info/config.buildinfo openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
263-
aliyunpan upload -ow info/sha256sums.txt openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
264-
aliyunpan upload -ow rom/*-generic-rootfs.tar.gz openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
265-
aliyunpan upload -ow rom/*-ext4-combined-efi.img.gz openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
266-
aliyunpan upload -ow rom/*-squashfs-combined-efi.img.gz openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
267-
# virtual machine images
268-
aliyunpan upload -ow virtual_images/README.md openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
269-
aliyunpan upload -ow virtual_images/sha256sums.txt openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
270-
aliyunpan upload -ow virtual_images/*.vmdk openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
271-
aliyunpan upload -ow virtual_images/*.vhd openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
272-
aliyunpan upload -ow virtual_images/*.qcow2 openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
273-
fi
274-
echo y | aliyunpan logout
227+
sshpass -p ${{ secrets.user_password }} ssh -o StrictHostKeyChecking=no ${{ secrets.user_name }}@${{ secrets.ftp_address }} >/dev/null 2>&1
228+
sshpass -p ${{ secrets.user_password }} ssh ${{ secrets.user_name }}@${{ secrets.ftp_address }} "/opt/sbin/fw-upload ${{ matrix.model }}"

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

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ jobs:
6565
env:
6666
DEBIAN_FRONTEND: noninteractive
6767
run: |
68-
sudo sh -c 'echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" >> /etc/apt/sources.list'
69-
sudo sh -c 'echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" >> /etc/apt/sources.list'
68+
sudo sh -c 'echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main" >> /etc/apt/sources.list'
69+
sudo sh -c 'echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main" >> /etc/apt/sources.list'
7070
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
7171
sudo apt-get update
72-
sudo apt-get install -y build-essential flex bison clang-15 cmake g++ gawk gcc-multilib g++-multilib gettext git libfuse-dev libncurses5-dev libssl-dev python3 python3-pip python3-ply python3-distutils python3-pyelftools rsync unzip zlib1g-dev file wget subversion patch upx-ucl autoconf automake curl asciidoc binutils bzip2 lib32gcc-s1 libc6-dev-i386 uglifyjs msmtp texinfo libreadline-dev libglib2.0-dev xmlto libelf-dev libtool autopoint antlr3 gperf ccache swig coreutils haveged scons libpython3-dev rename
72+
sudo apt-get install -y build-essential flex bison clang-17 cmake g++ gawk gcc-multilib g++-multilib gettext git libfuse-dev libncurses5-dev libssl-dev python3 python3-pip python3-ply python3-distutils python3-pyelftools rsync unzip zlib1g-dev file wget subversion patch upx-ucl autoconf automake curl asciidoc binutils bzip2 lib32gcc-s1 libc6-dev-i386 uglifyjs msmtp texinfo libreadline-dev libglib2.0-dev xmlto libelf-dev libtool autopoint antlr3 gperf ccache swig coreutils haveged scons libpython3-dev rename
7373
sudo apt-get clean
7474
git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
7575
df -Th
@@ -110,8 +110,6 @@ jobs:
110110
path: ${{ env.WORKDIR }}/rom/*.gz
111111

112112
- name: Install aliyunpan & login
113-
id: login
114-
continue-on-error: true
115113
run: |
116114
if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
117115
device_id=${{ secrets.device_id_r4s_dev }}
@@ -125,61 +123,14 @@ jobs:
125123
export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
126124
aliyun_token=`curl -s ${{ secrets.aliyun_token }} | openssl enc -aes-256-cfb -pbkdf2 -a -d -k ${{ secrets.token_dec }}`
127125
aliyunpan config set -device_id=$device_id >/dev/null 2>&1
128-
check_status() (
129-
curl -I -4 -m 5 -o /dev/null -s -w %{http_code} https://auth.aliyundrive.com/v2/account/token
130-
)
131-
while [[ "$(check_status)" -ne 405 ]]
132-
do
133-
check_status
134-
done
135126
echo
136127
echo $aliyun_token | aliyunpan login
137128
138-
- name: Retry login aliyunpan
139-
if: steps.login.outcome == 'failure'
140-
run: |
141-
export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
142-
aliyun_token=`curl -s ${{ secrets.aliyun_token }} | openssl enc -aes-256-cfb -pbkdf2 -a -d -k ${{ secrets.token_dec }}`
143-
echo $aliyun_token | aliyunpan login
144-
145129
- name: Upload Firmware - snapshots
146-
id: upload
147-
continue-on-error: true
148-
run: |
149-
export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
150-
DATE=$(date "+%Y-%m-%d")
151-
branch=23.05-SNAPSHOT
152-
if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
153-
aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r4s/snapshots/$branch/$DATE/
154-
aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r4s/snapshots/$branch/$DATE/
155-
aliyunpan upload -ow info/sha256sums.txt openwrt/nanopi-r4s/snapshots/$branch/$DATE/
156-
aliyunpan upload -ow rom/*-r4s-ext4-sysupgrade.img.gz openwrt/nanopi-r4s/snapshots/$branch/$DATE/
157-
aliyunpan upload -ow rom/*-r4s-squashfs-sysupgrade.img.gz openwrt/nanopi-r4s/snapshots/$branch/$DATE/
158-
elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
159-
aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r5s/snapshots/$branch/$DATE/
160-
aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r5s/snapshots/$branch/$DATE/
161-
aliyunpan upload -ow info/sha256sums.txt openwrt/nanopi-r5s/snapshots/$branch/$DATE/
162-
aliyunpan upload -ow rom/*-r5c-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/
163-
aliyunpan upload -ow rom/*-r5c-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/
164-
aliyunpan upload -ow rom/*-r5s-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/
165-
aliyunpan upload -ow rom/*-r5s-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/
166-
elif [ "${{ matrix.model }}" = "x86_64" ]; then
167-
aliyunpan upload -ow info/manifest.txt openwrt/x86_64/snapshots/$branch/$DATE/
168-
aliyunpan upload -ow info/config.buildinfo openwrt/x86_64/snapshots/$branch/$DATE/
169-
aliyunpan upload -ow info/sha256sums.txt openwrt/x86_64/snapshots/$branch/$DATE/
170-
aliyunpan upload -ow rom/*-generic-rootfs.tar.gz openwrt/x86_64/snapshots/$branch/$DATE/
171-
aliyunpan upload -ow rom/*-ext4-combined-efi.img.gz openwrt/x86_64/snapshots/$branch/$DATE/
172-
aliyunpan upload -ow rom/*-squashfs-combined-efi.img.gz openwrt/x86_64/snapshots/$branch/$DATE/
173-
fi
174-
echo y | aliyunpan logout
175-
176-
- name: Retry Upload Firmware - snapshots
177-
if: steps.upload.outcome == 'failure'
178130
run: |
179131
export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
180132
DATE=$(date "+%Y-%m-%d")
181133
branch=23.05-SNAPSHOT
182-
aliyunpan token update
183134
if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
184135
aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r4s/snapshots/$branch/$DATE/
185136
aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r4s/snapshots/$branch/$DATE/

0 commit comments

Comments
 (0)