Merge pull request #18 from mogeko:dev

distinguish img_ver and qbt_ver
This commit is contained in:
Mogeko 2021-11-18 20:02:47 +01:00 committed by GitHub
commit 157692ca3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions

View file

@ -12,6 +12,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: outputs:
is_new: ${{ steps.check_ver.outputs.is_new }} is_new: ${{ steps.check_ver.outputs.is_new }}
img_ver: ${{ steps.check_ver.outputs.img_ver }}
qbt_ver: ${{ steps.check_ver.outputs.qbt_ver }} qbt_ver: ${{ steps.check_ver.outputs.qbt_ver }}
lib_ver: ${{ steps.check_ver.outputs.lib_ver }} lib_ver: ${{ steps.check_ver.outputs.lib_ver }}
steps: steps:
@ -28,10 +29,12 @@ jobs:
QBT_VER=$(jq -r '.qbittorrent' ./latest.json) QBT_VER=$(jq -r '.qbittorrent' ./latest.json)
PKG_REL=$(jq -r '.pkgrel' ./latest.json) PKG_REL=$(jq -r '.pkgrel' ./latest.json)
if [ ${{ github.event_name }} == 'push' ]; then 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" echo "::set-output name=is_new::yes"
elif [ "${NEW_TAG:8:5}" != "${QBT_VER}" ]; then 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" echo "::set-output name=is_new::yes"
else else
echo "::set-output name=is_new::no" echo "::set-output name=is_new::no"
@ -73,7 +76,7 @@ jobs:
tags: | tags: |
type=edge type=edge
type=schedule,pattern={{date 'YYYYMMDD'}} type=schedule,pattern={{date 'YYYYMMDD'}}
type=raw,${{ needs.check.outputs.qbt_ver }} type=raw,${{ needs.check.outputs.img_ver }}
type=raw,latest type=raw,latest
- name: Build and push Docker image - name: Build and push Docker image

5
docs/README.md Normal file
View file

@ -0,0 +1,5 @@
# docker-qbittorrent
Provide version [data][latest.json] for Manual Mode.
[latest.json]: https://mogeko.github.io/docker-qbittorrent/latest.json

5
docs/latest.json Normal file
View file

@ -0,0 +1,5 @@
{
"qbittorrent": "4.3.8",
"libtorrent": "1.2.14",
"pkgrel": 1
}

View file

@ -1,5 +0,0 @@
{
"qbittorrent": "4.3.8",
"libtorrent": "1.2.14",
"pkgrel": 1
}

1
latest.json Symbolic link
View file

@ -0,0 +1 @@
docs/latest.json