From d0c2256bbb15e07399bab93dc59fcfeb1a181a1b Mon Sep 17 00:00:00 2001 From: Jatus Date: Tue, 30 Jan 2024 11:32:43 +0100 Subject: [PATCH] new pipeline version handling --- .github/workflows/docker-image.yml | 28 +++++++++++++------ .../devices/lights/DimmerableLightDevice.ts | 3 +- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 42962b6..e0842ba 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,7 +1,6 @@ name: Publish Docker image -on: - push +on: push jobs: push_to_registry: @@ -10,22 +9,35 @@ jobs: steps: - name: Check out the repo uses: actions/checkout@v4 - + + - name: Run read-yaml action + id: yaml-data + uses: jbutcher5/read-yaml@1.6 + with: + file: "./matter-bridge/config.yml" + key-path: '["version"]' + + - name: Display read-yaml output + run: echo "${{ steps.yaml-data.outputs.data }}" + - name: Log in to the Container registry - uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + uses: docker/login-action@v3.0.0 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GHCR }} - + - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + uses: docker/metadata-action@v5 with: images: ghcr.io/${{ github.repository }} - + tags: | + type=raw,value=${{ steps.yaml-data.outputs.data }} + type=raw,value=latest + - name: Build and push Docker image - uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 + uses: docker/build-push-action@v5.1.0 with: context: ./matter-bridge file: ./matter-bridge/Dockerfile diff --git a/matter-bridge/src/mapper/devices/lights/DimmerableLightDevice.ts b/matter-bridge/src/mapper/devices/lights/DimmerableLightDevice.ts index 5147fad..77bf638 100644 --- a/matter-bridge/src/mapper/devices/lights/DimmerableLightDevice.ts +++ b/matter-bridge/src/mapper/devices/lights/DimmerableLightDevice.ts @@ -19,7 +19,8 @@ export const addDimmerableLightDevice: AddHaDeviceToBridge = ( const device = new DimmableLightDevice( { onOff: haEntity.state === 'on' }, { - currentLevel: Number(haEntity.attributes['brightness']) || null, + currentLevel: + Number(haEntity.attributes['brightness']) / 255 || null, onLevel: 0.1, options: { coupleColorTempToLevel: false, executeIfOff: false }, }