aliyunpan: retry using a private server

sbwml · Aug 13, 2023 · 0aeba76 · 0aeba76
1 parent ad41b53
commit 0aeba76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 97 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -167,7 +167,6 @@ jobs:
         artifacts: ${{ env.WORKDIR }}/virtual_images/*-generic-squashfs-combined-efi*
 
     - name: Install aliyunpan & login
-      id: login
       continue-on-error: true
       run: |
         if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
@@ -182,23 +181,9 @@ jobs:
         export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
         aliyun_token=`curl -s ${{ secrets.aliyun_token }} | openssl enc -aes-256-cfb -pbkdf2 -a -d -k ${{ secrets.token_dec }}`
         aliyunpan config set -device_id=$device_id >/dev/null 2>&1
-        check_status() (
-          curl -I -4 -m 5 -o /dev/null -s -w %{http_code} https://auth.aliyundrive.com/v2/account/token
-        )
-        while [[ "$(check_status)" -ne 405 ]]
-        do
-          check_status
-        done
         echo
         echo $aliyun_token | aliyunpan login
 
-    - name: Retry login aliyunpan
-      if: steps.login.outcome == 'failure'
-      run: |
-        export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
-        aliyun_token=`curl -s ${{ secrets.aliyun_token }} | openssl enc -aes-256-cfb -pbkdf2 -a -d -k ${{ secrets.token_dec }}`
-        echo $aliyun_token | aliyunpan login
-
     - name: Upload Firmware - releases
       id: upload
       continue-on-error: true
@@ -239,36 +224,5 @@ jobs:
     - name: Retry Upload Firmware - releases
       if: steps.upload.outcome == 'failure'
       run: |
-        export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
-        version=$(cat openwrt/version.txt)
-        aliyunpan token update
-        if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
-          aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow info/sha256sums.txt openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/*-r4s-ext4-sysupgrade.img.gz openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/*-r4s-squashfs-sysupgrade.img.gz openwrt/nanopi-r4s/releases/${{ matrix.tag.version }}/$version/
-        elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
-          aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow info/sha256sums.txt openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/nanopi-*.tar.xz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/*-r5c-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/*-r5c-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/*-r5s-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/*-r5s-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/releases/${{ matrix.tag.version }}/$version/
-        elif [ "${{ matrix.model }}" = "x86_64" ]; then
-          aliyunpan upload -ow info/manifest.txt openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow info/config.buildinfo openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow info/sha256sums.txt openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/*-generic-rootfs.tar.gz openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/*-ext4-combined-efi.img.gz openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
-          aliyunpan upload -ow rom/*-squashfs-combined-efi.img.gz openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/
-          # virtual machine images
-          aliyunpan upload -ow virtual_images/README.md openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
-          aliyunpan upload -ow virtual_images/sha256sums.txt openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
-          aliyunpan upload -ow virtual_images/*.vmdk openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
-          aliyunpan upload -ow virtual_images/*.vhd openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
-          aliyunpan upload -ow virtual_images/*.qcow2 openwrt/x86_64/releases/${{ matrix.tag.version }}/$version/virtual_machine_images/
-        fi
-        echo y | aliyunpan logout
+        sshpass -p ${{ secrets.user_password }} ssh -o StrictHostKeyChecking=no ${{ secrets.user_name }}@${{ secrets.ftp_address }} >/dev/null 2>&1
+        sshpass -p ${{ secrets.user_password }} ssh ${{ secrets.user_name }}@${{ secrets.ftp_address }} "/opt/sbin/fw-upload ${{ matrix.model }}"
diff --git a/.github/workflows/build-snapshots.yml b/.github/workflows/build-snapshots.yml
@@ -110,8 +110,6 @@ jobs:
         path: ${{ env.WORKDIR }}/rom/*.gz
 
     - name: Install aliyunpan & login
-      id: login
-      continue-on-error: true
       run: |
         if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
           device_id=${{ secrets.device_id_r4s_dev }}
@@ -125,61 +123,14 @@ jobs:
         export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
         aliyun_token=`curl -s ${{ secrets.aliyun_token }} | openssl enc -aes-256-cfb -pbkdf2 -a -d -k ${{ secrets.token_dec }}`
         aliyunpan config set -device_id=$device_id >/dev/null 2>&1
-        check_status() (
-          curl -I -4 -m 5 -o /dev/null -s -w %{http_code} https://auth.aliyundrive.com/v2/account/token
-        )
-        while [[ "$(check_status)" -ne 405 ]]
-        do
-          check_status
-        done
         echo
         echo $aliyun_token | aliyunpan login
 
-    - name: Retry login aliyunpan
-      if: steps.login.outcome == 'failure'
-      run: |
-        export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
-        aliyun_token=`curl -s ${{ secrets.aliyun_token }} | openssl enc -aes-256-cfb -pbkdf2 -a -d -k ${{ secrets.token_dec }}`
-        echo $aliyun_token | aliyunpan login
-
     - name: Upload Firmware - snapshots
-      id: upload
-      continue-on-error: true
-      run: |
-        export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
-        DATE=$(date "+%Y-%m-%d")
-        branch=23.05-SNAPSHOT
-        if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
-          aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r4s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r4s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow info/sha256sums.txt openwrt/nanopi-r4s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow rom/*-r4s-ext4-sysupgrade.img.gz openwrt/nanopi-r4s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow rom/*-r4s-squashfs-sysupgrade.img.gz openwrt/nanopi-r4s/snapshots/$branch/$DATE/
-        elif [ "${{ matrix.model }}" = "nanopi-r5s" ]; then
-          aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r5s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r5s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow info/sha256sums.txt openwrt/nanopi-r5s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow rom/*-r5c-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow rom/*-r5c-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow rom/*-r5s-ext4-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/
-          aliyunpan upload -ow rom/*-r5s-squashfs-sysupgrade.img.gz openwrt/nanopi-r5s/snapshots/$branch/$DATE/
-        elif [ "${{ matrix.model }}" = "x86_64" ]; then
-          aliyunpan upload -ow info/manifest.txt openwrt/x86_64/snapshots/$branch/$DATE/
-          aliyunpan upload -ow info/config.buildinfo openwrt/x86_64/snapshots/$branch/$DATE/
-          aliyunpan upload -ow info/sha256sums.txt openwrt/x86_64/snapshots/$branch/$DATE/
-          aliyunpan upload -ow rom/*-generic-rootfs.tar.gz openwrt/x86_64/snapshots/$branch/$DATE/
-          aliyunpan upload -ow rom/*-ext4-combined-efi.img.gz openwrt/x86_64/snapshots/$branch/$DATE/
-          aliyunpan upload -ow rom/*-squashfs-combined-efi.img.gz openwrt/x86_64/snapshots/$branch/$DATE/
-        fi
-        echo y | aliyunpan logout
-
-    - name: Retry Upload Firmware - snapshots
-      if: steps.upload.outcome == 'failure'
       run: |
         export ALIYUNPAN_CONFIG_DIR="$(pwd)/.aliyunpan"
         DATE=$(date "+%Y-%m-%d")
         branch=23.05-SNAPSHOT
-        aliyunpan token update
         if [ "${{ matrix.model }}" = "nanopi-r4s" ]; then
           aliyunpan upload -ow info/manifest.txt openwrt/nanopi-r4s/snapshots/$branch/$DATE/
           aliyunpan upload -ow info/config.buildinfo openwrt/nanopi-r4s/snapshots/$branch/$DATE/