From 4bc460fb3a50719803df0f82dbb2dc9cf85c422a Mon Sep 17 00:00:00 2001 From: Mogeko Date: Thu, 18 Nov 2021 18:46:27 +0000 Subject: [PATCH 1/4] fix(ci): distinguish img_ver and qbt_ver --- .github/workflows/auto-update.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index ef3fd17..8606158 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -12,6 +12,7 @@ jobs: 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 }} steps: @@ -28,10 +29,12 @@ jobs: QBT_VER=$(jq -r '.qbittorrent' ./latest.json) PKG_REL=$(jq -r '.pkgrel' ./latest.json) if [ ${{ github.event_name }} == 'push' ]; then - echo "::set-output name=qbt_ver::${QBT_VER}-r${PKG_REL}" + 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=qbt_ver::${NEW_TAG:8:5}-r0" + 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" else echo "::set-output name=is_new::no" @@ -73,7 +76,7 @@ jobs: tags: | type=edge type=schedule,pattern={{date 'YYYYMMDD'}} - type=raw,${{ needs.check.outputs.qbt_ver }} + type=raw,${{ needs.check.outputs.img_ver }} type=raw,latest - name: Build and push Docker image From 8a96f9e34ab36a1cb5692bce0a2982d2aed02f4b Mon Sep 17 00:00:00 2001 From: Mogeko Date: Thu, 18 Nov 2021 18:59:16 +0000 Subject: [PATCH 2/4] docs: gh-pages here --- docs/README.md | 5 +++++ docs/latest.json | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 docs/README.md create mode 100644 docs/latest.json diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..601bb0c --- /dev/null +++ b/docs/README.md @@ -0,0 +1,5 @@ +# docker-qbittorrent + +Provide version [data][latest.json] for Manual Mode. + +[latest.json]: https://mogeko.github.io/docker-qbittorrent/latest.json diff --git a/docs/latest.json b/docs/latest.json new file mode 100644 index 0000000..7541025 --- /dev/null +++ b/docs/latest.json @@ -0,0 +1,5 @@ +{ + "qbittorrent": "4.3.8", + "libtorrent": "1.2.14", + "pkgrel": 1 +} From 01df7cde3f3169bbd668c490cecb0762d366d3c0 Mon Sep 17 00:00:00 2001 From: Mogeko Date: Thu, 18 Nov 2021 19:01:14 +0000 Subject: [PATCH 3/4] docs: remove /latest.json --- latest.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 latest.json diff --git a/latest.json b/latest.json deleted file mode 100644 index 7541025..0000000 --- a/latest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "qbittorrent": "4.3.8", - "libtorrent": "1.2.14", - "pkgrel": 1 -} From ac0a09039e41d5f202f5e127a5fc3a30b9dd6981 Mon Sep 17 00:00:00 2001 From: Mogeko Date: Thu, 18 Nov 2021 19:01:52 +0000 Subject: [PATCH 4/4] docs: link latest.json to docs/latest.json --- latest.json | 1 + 1 file changed, 1 insertion(+) create mode 120000 latest.json diff --git a/latest.json b/latest.json new file mode 120000 index 0000000..df862d5 --- /dev/null +++ b/latest.json @@ -0,0 +1 @@ +docs/latest.json \ No newline at end of file