From 747e5652acdc665a636a4c6695b7afb9b832a5e5 Mon Sep 17 00:00:00 2001
From: Mogeko <zhengjunyi@live.com>
Date: Fri, 19 Nov 2021 23:52:33 +0000
Subject: [PATCH] build(ci) enable unstable version of qbittorrent

---
 .github/workflows/auto-update.yml | 15 +++++++++------
 .github/workflows/build.yml       |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index c66d3a5..79420ec 100644
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -11,10 +11,11 @@ jobs:
   check:
     runs-on: ubuntu-latest
     outputs:
-      is_new: ${{ steps.check_ver.outputs.is_new }}
       img_ver: ${{ steps.check_ver.outputs.img_ver }}
       qbt_ver: ${{ steps.check_ver.outputs.qbt_ver }}
       lib_ver: ${{ steps.check_ver.outputs.lib_ver }}
+      is_new: ${{ steps.check_ver.outputs.is_new }}
+      latest: ${{ steps.check_ver.outputs.latest }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -24,15 +25,17 @@ jobs:
       - name: Check version
         id: check_ver
         run: |
-          OLD_VER=$(curl -s "${GHCR_URL}" | grep -Po "(\d+\.){2}\d+\-r\d+" | head -1)
-          NEW_TAG=$(curl -s "${REPO_TAGS}" | grep -Po "release-(\d+\.){2}\d+\.zip" | head -1)
+          OLD_VER=$(curl -s "${GHCR_URL}" | grep -Po "(\d+\.)+\d+(|beta\d+|rc\d+)-r\d+" | head -1)
+          NEW_TAG=$(curl -s "${REPO_TAGS}" | grep -Po "(\d+\.)+\d+(|beta\d+|rc\d+)\.zip" | head -1)
           LIB_VER=$(jq -r '.libtorrent' ./latest.json)
           QBT_VER=$(jq -r '.qbittorrent' ./latest.json)
           PKG_REL=$(jq -r '.pkgrel' ./latest.json)
-          if [ ${{ github.event_name }} == 'push' ]; then
+          if echo "${NEW_TAG%.zip}" | grep -Pq "^(\d+\.){2}\d+$"; then
+            echo "::set-output name=latest::type=raw,latest"
+          elif [ ${{ github.event_name }} == 'push' ]; then
             IMG_VER="${QBT_VER}-r${PKG_REL}"
           else
-            QBT_VER="${NEW_TAG:8:5}"
+            QBT_VER="${NEW_TAG%.zip}"
             IMG_VER="${QBT_VER}-r0"
           fi
           IS_NEW=$([[ "${IMG_VER}" != "${OLD_VER}" ]] && echo "yes" || echo "no")
@@ -78,7 +81,7 @@ jobs:
             type=edge
             type=schedule,pattern={{date 'YYYYMMDD'}}
             type=raw,${{ needs.check.outputs.img_ver }}
-            type=raw,latest
+            ${{ needs.check.outputs.latest }}
 
       - name: Build and push Docker image
         id: build
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ce3116..a9e375c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
         id: check_ver
         run: |
           NEW_TAG=$(curl -s "${REPO_TAGS}" | grep -Po "(\d+\.)+\d+(|beta\d+|rc\d+)\.zip" | head -1)
-          if echo "${NEW_TAG%.zip}-r0" | grep -Pq "^(\d+\.)+\d+$"; then
+          if echo "${NEW_TAG%.zip}" | grep -Pq "^(\d+\.){2}\d+$"; then
             echo "::set-output name=latest::type=raw,latest"
           fi
           echo "::set-output name=new_ver::${NEW_TAG%.zip}-r0"