Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Feramance/Qbitrr into 92-…
Browse files Browse the repository at this point in the history
…container-keeps-crashing-attributeerror-nonetype-object-has-no-attribute-torrents_create_tags
  • Loading branch information
Feramance committed Jul 9, 2024
2 parents 18f8156 + 9d74b2f commit 59e52f7
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.8.0
current_version = 4.8.1
tag = false
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
serialize =
Expand Down
51 changes: 41 additions & 10 deletions .github/workflows/pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,16 +148,7 @@ jobs:
feramance/qbitrr
ghcr.io/${{ steps.string.outputs.lowercase }}
tags: |
type=ref,event=pr,suffix=-arm
- name: Extract metadata (tags, labels) for ARM Docker
id: meta-arm
uses: docker/metadata-action@v5
with:
images: |
feramance/qbitrr
ghcr.io/${{ steps.string.outputs.lowercase }}
tags: |
type=ref,event=pr,suffix=-arm
type=ref,event=pr
- name: Build and push Docker images
env:
DOCKER_BUILDKIT: 1
Expand All @@ -170,6 +161,46 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
docker_image_arm:
name: Build ARM Docker Image
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
steps:
- id: string
uses: ASzc/change-string-case-action@v6
with:
string: ${{ github.repository }}
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to Container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.REG_TOKEN }}
- name: Extract metadata (tags, labels) for ARM Docker
id: meta-arm
uses: docker/metadata-action@v5
with:
images: |
feramance/qbitrr
ghcr.io/${{ steps.string.outputs.lowercase }}
tags: |
type=ref,event=pr,suffix=-arm
- name: Build and push ARM Docker images
env:
DOCKER_BUILDKIT: 1
Expand Down
21 changes: 14 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## v4.8.1 (09/07/2024)
- [[patch] pull request #91 from Feramance/90-native-apple-silicon-support-docker](https://github.com/Feramance/qBitrr/commit/04e6f8261308729a69bd30359b6f67fadcbe0745) - @Feramance
- [Fixed stalled re-search type error](https://github.com/Feramance/qBitrr/commit/7c0dbfbcb0788ad9f9984ffa8ef88c8cf6dfb092) - @Feramance
- [Updated loggiong for stalled delay -1](https://github.com/Feramance/qBitrr/commit/2f8af3ceeadbbdf3e04d44c9a3896b05ed5db9a2) - @Feramance
- [Fixed workflow name](https://github.com/Feramance/qBitrr/commit/fd9c2a7a0776218a7ff9c931161cbc937d11ce9f) - @Feramance
- [ARM workflow updates](https://github.com/Feramance/qBitrr/commit/7f1a666864bc817fd9bb4c78393762b8a5b1828b) - @Feramance
- [Update PR workflow](https://github.com/Feramance/qBitrr/commit/17e583a6a534f1e7622547492df885e1e5989525) - @Feramance
- [Merge pull request #89 from Feramance/dependabot/pip/certifi-2024.7.4](https://github.com/Feramance/qBitrr/commit/8ed25ff3593e20f0c4ac2644173522a121ced646) - @Feramance
- [Bump certifi from 2024.6.2 to 2024.7.4](https://github.com/Feramance/qBitrr/commit/890f301127ffda660fc860ae0b73964260d03eb1) - @dependabot[bot]
- [Merge pull request #88 from Feramance/dependabot/github_actions/dependabot/fetch-metadata-2.2.0](https://github.com/Feramance/qBitrr/commit/39076cd80be5d0ec36562a2959cbc730b4a304e9) - @Feramance
- [Bump dependabot/fetch-metadata from 2.1.0 to 2.2.0](https://github.com/Feramance/qBitrr/commit/60fbe642c7134abc8f65e393defe409262fbd48c) - @dependabot[bot]

---

## v4.8.0 (05/07/2024)
- [[minor] Added new functionality to allow stalled torrents with or without a delay](https://github.com/Feramance/qBitrr/commit/be248e5d3ada20694ad45710a60d0d0288bc7e44) - @Feramance
- [Small fixes and logging improvements](https://github.com/Feramance/qBitrr/commit/cf4497fae39ef5ff185ec2e875a3eefb5f956b54) - @Feramance
Expand Down Expand Up @@ -235,10 +249,3 @@

## v4.5.6 (01/05/2024)
- [[patch] Hopefully last binary build fix](https://github.com/Feramance/qBitrr/commit/25a7404732a4f095bb16535c1350ac7da22c8af8) - @Feramance

---

## v4.5.5 (01/05/2024)
- [[patch] Another bug](https://github.com/Feramance/qBitrr/commit/5bdbc3f2e919fc5dcfa1ebd1bc74cb082170bedf) - @Feramance
- [Merge branch 'master' of https://github.com/Feramance/Qbitrr](https://github.com/Feramance/qBitrr/commit/2f9fead49b4afda24c5dea498a9de5661fa8f7a3) - @Feramance
- [[patch] workflow update](https://github.com/Feramance/qBitrr/commit/809cf240a5bfddf9e83e5c0823f554dbeb7d898c) - @Feramance
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM python:3.10

LABEL Name="qBitrr"
LABEL Maintainer="feramance"
LABEL Version="4.8.0"
LABEL Version="4.8.1"
LABEL org.opencontainers.image.source=https://github.com/feramance/qbitrr

# Env used by the script to determine if its inside a docker -
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ target-version = ['py38']

[tool.poetry]
name = "pypi-public"
version = "4.8.0"
version = "4.8.1"
description = "A simple script to monitor qBit and communicate with Radarr and Sonarr"
authors = ["Drapersniper", "Feramance"]
readme = "README.md"
Expand Down
4 changes: 2 additions & 2 deletions qBitrr/bundled_data.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = "4.8.0"
git_hash = "fd32445"
version = "4.8.1"
git_hash = "9b49d6b"
license_text = (
"Licence can be found on:\n\nhttps://github.com/Feramance/qBitrr/blob/master/LICENSE"
)
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = qBitrr2
version = 4.8.0
version = 4.8.1
description = "A simple Python script to talk to qBittorrent and Arr's"
long_description = file: README.md
long_description_content_type = text/markdown
Expand Down

0 comments on commit 59e52f7

Please sign in to comment.