Merge dev to master

.dockerignore

@@ -0,0 +1,4 @@
+src/FHEM/trunk
+.github
+.vscode
+.cache

.github/workflows/cacheCleanup.yml

@@ -0,0 +1,36 @@
+name: cleanup caches by a branch / PR
+on:
+  pull_request:
+    types:
+      - closed
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      # `actions:write` permission is required to delete caches
+      #   See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
+      actions: write
+      contents: read
+    steps:
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          REPO=${{ github.repository }}
+          BRANCH=refs/pull/${{ github.event.pull_request.number }}/merge
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys. 
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prepare-docker/action.yml

@@ -38,14 +38,14 @@ runs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to DockerHub
-      if: github.event_name != 'pull_request' && inputs.DOCKER_HUB_USERNAME != null && inputs.DOCKER_HUB_ACCESS_TOKEN != null 
+      if: (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'publishImage') ) && inputs.DOCKER_HUB_USERNAME != null && inputs.DOCKER_HUB_ACCESS_TOKEN != null 
       uses: docker/login-action@v3
       with:
         username: ${{ inputs.DOCKER_HUB_USERNAME }}
         password: ${{ inputs.DOCKER_HUB_ACCESS_TOKEN }}
 
     - name: Login to GitHub Container Registry
-      if: github.event_name != 'pull_request' && inputs.GHCR_OWNER != null && inputs.GHCR_ACCESS_TOKEN != null
+      if:  (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'publishImage') ) && inputs.GHCR_OWNER != null && inputs.GHCR_ACCESS_TOKEN != null
       uses: docker/login-action@v3 
       with:
         registry: ghcr.io

.github/workflows/prepare-svn/action.yml

@@ -1,42 +1,45 @@
-name: Reusable composit workflow which prepares svn 
-description: pull svn remote, extract svn ref and latest tag
-outputs:
-  VARIANT_FHEM:
-    description: "Combined string, with FHEM Version and latest svn commit id"
-    value: ${{ steps.svnVars.outputs.VARIANT_FHEM }}
-  FHEM_REVISION_LATEST:
-    description: "The revision Number pulled from SVN"
-    value: ${{ steps.svnVars.outputs.FHEM_REVISION_LATEST }}
-
-
-runs:
-  using: "composite"
-  steps:
-    - name: Get latest svn revision from remote server
-      shell: bash
-      id: svnRemote
-      run: echo "LAST_SVN_REVISION=$( svn info --show-item revision https://svn.fhem.de/fhem/trunk )" >> $GITHUB_OUTPUT
-
-    - name: Cache fhem 
-      id: cache-fhem
-      uses: actions/cache@v4
-      with:
-        path: ./src/fhem/trunk
-        key: ${{ runner.os }}-fhemsvn-${{ steps.svnRemote.outputs.LAST_SVN_REVISION }}
-        restore-keys: |
-          ${{ runner.os }}-fhemsvn-
-
-    - name: Update or checkout fhem from svn
-      shell: bash
-      if: steps.cache-fhem.outputs.cache-hit != 'true'
-      run: svn update ./src/fhem/trunk/  || svn co https://svn.fhem.de/fhem/trunk ./src/fhem/trunk;
-
-    - name: prepare svn vars
-      shell: bash
-      id: svnVars
-      working-directory: ./src/fhem/trunk
-      run: |
-        FHEM_REVISION_LATEST=$( svn info --show-item last-changed-revision)
-        FHEM_VERSION=$( svn ls "^/tags" https://svn.fhem.de/fhem/ | grep "FHEM_" | sort | tail -n 1 | cut -d / -f 1 | cut -d " " -f 1 |cut -d _ -f 2- | sed s/_/./g )
-        echo "VARIANT_FHEM=$(echo "${FHEM_VERSION}-s${FHEM_REVISION_LATEST}")" >> $GITHUB_OUTPUT
-        echo "FHEM_REVISION_LATEST=$(echo "$FHEM_REVISION_LATEST")" >> $GITHUB_OUTPUT
+name: Reusable composit workflow which prepares svn 
+description: pull svn remote, extract svn ref and latest tag
+outputs:
+  VARIANT_FHEM:
+    description: "Combined string, with FHEM Version and latest svn commit id"
+    value: ${{ steps.svnVars.outputs.VARIANT_FHEM }}
+  FHEM_REVISION_LATEST:
+    description: "The revision Number pulled from SVN"
+    value: ${{ steps.svnVars.outputs.FHEM_REVISION_LATEST }}
+
+
+runs:
+  using: "composite"
+  steps:
+    - name: install svn
+      shell: bash
+      run: sudo apt-get install -y subversion
+    - name: Get latest svn revision from remote server
+      shell: bash
+      id: svnRemote
+      run: echo "LAST_SVN_REVISION=$( svn info --show-item revision https://svn.fhem.de/fhem/trunk )" >> $GITHUB_OUTPUT
+
+    - name: Cache fhem 
+      id: cache-fhem
+      uses: actions/cache@v4
+      with:
+        path: ./src/fhem/trunk
+        key: ${{ runner.os }}-fhemsvn-${{ steps.svnRemote.outputs.LAST_SVN_REVISION }}
+        restore-keys: |
+          ${{ runner.os }}-fhemsvn-
+
+    - name: Update or checkout fhem from svn
+      shell: bash
+      if: steps.cache-fhem.outputs.cache-hit != 'true'
+      run: svn update ./src/fhem/trunk/  || svn co https://svn.fhem.de/fhem/trunk ./src/fhem/trunk;
+
+    - name: prepare svn vars
+      shell: bash
+      id: svnVars
+      working-directory: ./src/fhem/trunk
+      run: |
+        FHEM_REVISION_LATEST=$( svn info --show-item last-changed-revision)
+        FHEM_VERSION=$( svn ls "^/tags" https://svn.fhem.de/fhem/ | grep "FHEM_" | sort | tail -n 1 | cut -d / -f 1 | cut -d " " -f 1 |cut -d _ -f 2- | sed s/_/./g )
+        echo "VARIANT_FHEM=$(echo "${FHEM_VERSION}-s${FHEM_REVISION_LATEST}")" >> $GITHUB_OUTPUT
+        echo "FHEM_REVISION_LATEST=$(echo "$FHEM_REVISION_LATEST")" >> $GITHUB_OUTPUT

.gitignore

@@ -5,3 +5,6 @@ fhem/backup/*
 fhem/cache/*
 fhem/log/*
 fhem/restoreDir/*
+.vscode/*
+src/FHEM/trunk/*
+.cache/*