From 2ebb40a80226ec298d06b895573d9f6186e09902 Mon Sep 17 00:00:00 2001 From: Tom Quist Date: Sat, 19 Jul 2025 12:46:40 +0200 Subject: [PATCH 1/2] ci: add develop branch and next tag --- .github/workflows/build-image.yml | 6 ++++++ .github/workflows/ci.yml | 4 ++-- .github/workflows/merge-manifests.yml | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 307739b..3c0c5db 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -57,6 +57,12 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ inputs.registry }}/${{ steps.lower-repo.outputs.IMAGE_NAME }} + tags: | + type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} + type=raw,value=next,enable=${{ github.ref == 'refs/heads/develop' }} + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Log in to Container registry diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e534e7..7efd1b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,10 +2,10 @@ name: CI Pipeline on: push: - branches: [ main ] + branches: [ main, develop ] tags: [ "*.*.*" ] pull_request: - branches: [ main ] + branches: [ main, develop ] permissions: packages: write diff --git a/.github/workflows/merge-manifests.yml b/.github/workflows/merge-manifests.yml index fa53160..41b5699 100644 --- a/.github/workflows/merge-manifests.yml +++ b/.github/workflows/merge-manifests.yml @@ -37,6 +37,12 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ inputs.registry }}/${{ steps.lower-repo.outputs.IMAGE_NAME }} + tags: | + type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} + type=raw,value=next,enable=${{ github.ref == 'refs/heads/develop' }} + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} - name: Log in to Container registry uses: docker/login-action@v3 with: From 8358e90b72251fecc7e46847518a1a0254b0071c Mon Sep 17 00:00:00 2001 From: Tom Quist Date: Sat, 19 Jul 2025 13:16:41 +0200 Subject: [PATCH 2/2] Set HA addon version to next --- ha_addon/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ha_addon/config.yaml b/ha_addon/config.yaml index cae41cd..e205fa0 100644 --- a/ha_addon/config.yaml +++ b/ha_addon/config.yaml @@ -1,5 +1,5 @@ name: "B2500 Meter" -version: "1.0.8" +version: "next" slug: b2500_meter description: >- "Replicates a Smart Meter device for a B2500 energy storage system while allowing integration with various smart meters."