Skip to content

Commit 4b6fa45

Browse files
committed
Update version to 7.8.1 and enhance Docker workflows for B8- branches
1 parent 3843826 commit 4b6fa45

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed

.github/workflows/docker-build-push.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ jobs:
5454
5555
# Login to DockerHub
5656
- name: Login to DockerHub
57-
if: github.event_name != 'pull_request' && (github.ref != 'refs/heads/main' || github.event.inputs.force_push == 'true' || startsWith(github.ref, 'refs/tags/'))
57+
if: github.event_name != 'pull_request' && (github.ref != 'refs/heads/main' || github.event.inputs.force_push == 'true' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/B8-'))
5858
uses: docker/login-action@v3
5959
with:
6060
username: ${{ secrets.DOCKERHUB_USERNAME }}
6161
password: ${{ secrets.DOCKERHUB_PASSWORD }}
6262

6363
# Login to GitHub Container Registry
6464
- name: Login to GitHub Container Registry
65-
if: github.event_name != 'pull_request' && (github.ref != 'refs/heads/main' || github.event.inputs.force_push == 'true' || startsWith(github.ref, 'refs/tags/'))
65+
if: github.event_name != 'pull_request' && (github.ref != 'refs/heads/main' || github.event.inputs.force_push == 'true' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/B8-'))
6666
uses: docker/login-action@v3
6767
with:
6868
registry: ghcr.io
@@ -75,8 +75,8 @@ jobs:
7575
with:
7676
context: .
7777
platforms: linux/amd64,linux/arm64
78-
# Only push if not a PR AND (not main branch OR manual force OR tagged release)
79-
push: ${{ github.event_name != 'pull_request' && (github.ref != 'refs/heads/main' || github.event.inputs.force_push == 'true' || startsWith(github.ref, 'refs/tags/')) }}
78+
# Only push if not a PR AND (not main branch OR manual force OR tagged release OR B8- branch)
79+
push: ${{ github.event_name != 'pull_request' && (github.ref != 'refs/heads/main' || github.event.inputs.force_push == 'true' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/B8-')) }}
8080
tags: ${{ steps.meta.outputs.tags }}
8181
labels: ${{ steps.meta.outputs.labels }}
8282
cache-from: type=gha

.github/workflows/docker-image.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,23 @@ jobs:
105105
ghcr.io/plexguide/huntarr:${{ steps.meta.outputs.VERSION }}
106106
ghcr.io/plexguide/huntarr:latest
107107
108-
# 7d) Build & Push for any other branch
108+
# 7d) Build & Push for B8- branches (without latest tag)
109+
- name: Build and Push (B8- branch)
110+
if: startsWith(github.ref, 'refs/heads/B8-') && github.event_name != 'pull_request'
111+
uses: docker/build-push-action@v3
112+
with:
113+
context: .
114+
push: true
115+
platforms: linux/amd64,linux/arm64
116+
tags: |
117+
huntarr/huntarr:${{ steps.meta.outputs.BRANCH }}
118+
huntarr/huntarr:${{ github.sha }}
119+
ghcr.io/plexguide/huntarr:${{ steps.meta.outputs.BRANCH }}
120+
ghcr.io/plexguide/huntarr:${{ github.sha }}
121+
122+
# 7e) Build & Push for any other branch (not B8-)
109123
- name: Build and Push (feature branch)
110-
if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' && steps.meta.outputs.IS_TAG != 'true' && github.event_name != 'pull_request'
124+
if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' && !startsWith(github.ref, 'refs/heads/B8-') && steps.meta.outputs.IS_TAG != 'true' && github.event_name != 'pull_request'
111125
uses: docker/build-push-action@v3
112126
with:
113127
context: .
@@ -119,7 +133,7 @@ jobs:
119133
ghcr.io/plexguide/huntarr:${{ steps.meta.outputs.BRANCH }}
120134
ghcr.io/plexguide/huntarr:${{ github.sha }}
121135
122-
# 7e) Just build on pull requests
136+
# 7f) Just build on pull requests
123137
- name: Build (PR)
124138
if: github.event_name == 'pull_request'
125139
uses: docker/build-push-action@v3

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.8.0
1+
7.8.1

0 commit comments

Comments
 (0)