From 63f170b78ffb2bd54de64c75a8c5d049995609f8 Mon Sep 17 00:00:00 2001 From: Mogeko Date: Thu, 18 Nov 2021 19:12:18 +0000 Subject: [PATCH 1/4] docs: remove /latest.json --- docs/latest.json | 2 +- latest.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 latest.json diff --git a/docs/latest.json b/docs/latest.json index 7541025..c1b80c8 100644 --- a/docs/latest.json +++ b/docs/latest.json @@ -1,5 +1,5 @@ { - "qbittorrent": "4.3.8", + "qbittorrent": "4.3.9", "libtorrent": "1.2.14", "pkgrel": 1 } diff --git a/latest.json b/latest.json deleted file mode 120000 index df862d5..0000000 --- a/latest.json +++ /dev/null @@ -1 +0,0 @@ -docs/latest.json \ No newline at end of file From 430c4602be4097ca15070023245604ecaa7f9b1b Mon Sep 17 00:00:00 2001 From: Mogeko Date: Thu, 18 Nov 2021 19:12:48 +0000 Subject: [PATCH 2/4] docs: mv latest.json --- docs/latest.json => latest.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/latest.json => latest.json (100%) diff --git a/docs/latest.json b/latest.json similarity index 100% rename from docs/latest.json rename to latest.json From 25b22b3d9d8d6059fae15302dac732f5ce3e2cc2 Mon Sep 17 00:00:00 2001 From: Mogeko Date: Thu, 18 Nov 2021 19:17:00 +0000 Subject: [PATCH 3/4] docs: link docs/latest.json to latest.json --- docs/latest.json | 1 + latest.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 docs/latest.json diff --git a/docs/latest.json b/docs/latest.json new file mode 120000 index 0000000..b115f35 --- /dev/null +++ b/docs/latest.json @@ -0,0 +1 @@ +../latest.json \ No newline at end of file diff --git a/latest.json b/latest.json index c1b80c8..7541025 100644 --- a/latest.json +++ b/latest.json @@ -1,5 +1,5 @@ { - "qbittorrent": "4.3.9", + "qbittorrent": "4.3.8", "libtorrent": "1.2.14", "pkgrel": 1 } From 9d8db5bf094da9f1de1d07806f4a555386b15e8f Mon Sep 17 00:00:00 2001 From: Mogeko Date: Thu, 18 Nov 2021 19:48:30 +0000 Subject: [PATCH 4/4] build(ci): even manual mode also checks updates --- .github/workflows/auto-update.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 8606158..c66d3a5 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -24,23 +24,24 @@ 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) 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 - echo "::set-output name=img_ver::${QBT_VER}-r${PKG_REL}" - echo "::set-output name=qbt_ver::${QBT_VER}" - echo "::set-output name=is_new::yes" - elif [ "${NEW_TAG:8:5}" != "${QBT_VER}" ]; then - echo "::set-output name=img_ver::${NEW_TAG:8:5}-r0" - echo "::set-output name=qbt_ver::${NEW_TAG:8:5}" - echo "::set-output name=is_new::yes" + IMG_VER="${QBT_VER}-r${PKG_REL}" else - echo "::set-output name=is_new::no" + QBT_VER="${NEW_TAG:8:5}" + IMG_VER="${QBT_VER}-r0" fi + IS_NEW=$([[ "${IMG_VER}" != "${OLD_VER}" ]] && echo "yes" || echo "no") + echo "::set-output name=img_ver::${IMG_VER}" + echo "::set-output name=qbt_ver::${QBT_VER}" echo "::set-output name=lib_ver::${LIB_VER}" + echo "::set-output name=is_new::${IS_NEW}" env: + GHCR_URL: https://github.com/mogeko/docker-qbittorrent/pkgs/container/qbittorrent REPO_TAGS: https://github.com/qbittorrent/qBittorrent/tags build: