From 19bd94604718375b7a7bb6c8656606dc84c5c586 Mon Sep 17 00:00:00 2001 From: Mogeko Date: Mon, 15 Nov 2021 22:27:01 +0000 Subject: [PATCH 1/2] build(ci): enable image tag 'latest' --- .github/workflows/auto-update.yml | 1 + .github/workflows/build.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 9b83301..7d1bc56 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -60,6 +60,7 @@ jobs: type=edge type=schedule,pattern={{date 'YYYYMMDD'}} type=raw,${{ needs.check.outputs.version }} + type=raw,latest - name: Build and push Docker image id: build diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba9e125..cfd4d26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,6 +57,7 @@ jobs: type=edge type=schedule,pattern={{date 'YYYYMMDD'}} type=raw,${{ needs.check.outputs.version }} + type=raw,latest - name: Save status run: echo ${{ toJSON(steps.meta.outputs.json) }} > ${{ github.workspace }}/status.json From edcee500eb4483fdf40327760acefe7fc000dbb5 Mon Sep 17 00:00:00 2001 From: Mogeko Date: Mon, 15 Nov 2021 22:43:19 +0000 Subject: [PATCH 2/2] build: simplified check logic --- .github/workflows/auto-update.yml | 18 +++++++----------- .github/workflows/build.yml | 16 ++++++---------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 7d1bc56..aa96dbb 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -2,18 +2,18 @@ name: update-bot on: schedule: - - cron: '30 20 * * *' + - cron: '00 23 * * *' env: REGISTRY: ghcr.io - IMAGE_NAME: mogeko/qbittorrent + IMAGE_NAME: ${{ github.repository_owner }}/qbittorrent jobs: check: runs-on: ubuntu-latest outputs: - is_new: ${{ steps.check_ver.outputs.is_new }} - version: ${{ steps.check_ver.outputs.version }} + old_ver: ${{ steps.check_ver.outputs.old_ver }} + new_ver: ${{ steps.check_ver.outputs.new_ver }} steps: - name: Check version id: check_ver @@ -21,12 +21,8 @@ jobs: get_ver() (curl -s "$@" | grep -Po "(\d+\.)+\d+\-r\d+" | head -1) OLD_VER=$(get_ver ${GHCO_URL}) NEW_VER=$(get_ver ${ALPINE_PKG_URL}) - if [ "$NEW_VER" != "$OLD_VER" ]; then - echo "::set-output name=is_new::true" - else - echo "::set-output name=is_new::false" - fi - echo "::set-output name=version::${NEW_VER}" + echo "::set-output name=old_ver::${OLD_VER}" + echo "::set-output name=new_ver::${NEW_VER}" env: ALPINE_PKG_URL: https://pkgs.alpinelinux.org/package/edge/testing/x86_64/qbittorrent-nox GHCO_URL: https://github.com/mogeko/docker-qbittorrent/pkgs/container/qbittorrent @@ -34,7 +30,7 @@ jobs: build: runs-on: ubuntu-latest needs: check - if: ${{ needs.check.outputs.is_new }} + if: ${{ needs.check.outputs.old_ver != needs.check.outputs.new_ver }} permissions: packages: write contents: read diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cfd4d26..f65ba95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,14 +10,14 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: mogeko/qbittorrent + IMAGE_NAME: ${{ github.repository_owner }}/qbittorrent jobs: check: runs-on: ubuntu-latest outputs: - is_new: ${{ steps.check_ver.outputs.is_new }} - version: ${{ steps.check_ver.outputs.version }} + old_ver: ${{ steps.check_ver.outputs.old_ver }} + new_ver: ${{ steps.check_ver.outputs.new_ver }} steps: - name: Check version id: check_ver @@ -25,12 +25,8 @@ jobs: get_ver() (curl -s "$@" | grep -Po "(\d+\.)+\d+\-r\d+" | head -1) OLD_VER=$(get_ver ${GHCO_URL}) NEW_VER=$(get_ver ${ALPINE_PKG_URL}) - if [ "$NEW_VER" != "$OLD_VER" ]; then - echo "::set-output name=is_new::true" - else - echo "::set-output name=is_new::false" - fi - echo "::set-output name=version::${NEW_VER}" + echo "::set-output name=old_ver::${OLD_VER}" + echo "::set-output name=new_ver::${NEW_VER}" env: ALPINE_PKG_URL: https://pkgs.alpinelinux.org/package/edge/testing/x86_64/qbittorrent-nox GHCO_URL: https://github.com/mogeko/docker-qbittorrent/pkgs/container/qbittorrent @@ -38,7 +34,7 @@ jobs: build: runs-on: ubuntu-latest needs: check - if: ${{ needs.check.outputs.is_new }} + if: ${{ needs.check.outputs.old_ver != needs.check.outputs.new_ver }} permissions: packages: write contents: read