Merge pull request 'Update .gitea/workflows/tag-release.yaml' (#56) from erichardson-patch-1 into master

Reviewed-on: #56

.gitea/workflows/publish.yaml

@@ -1,27 +0,0 @@
-name: Build and publish Image
-run-name: ${{ gitea.actor }} is building py-eagle-mqtt image
-on:
-  push:
-    branches:
-      - '*'         # matches every branch that doesn't contain a '/'
-      - '*/*'       # matches every branch containing a single '/'
-      - '**'        # matches every branch
-      - '!master'   # excludes master
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.1.1
-
-    - name: Build Docker image
-      run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:dev ./Docker/
-
-    - name: Login to Harbor
-      run: docker login -u ${{ secrets.HARBOR_USERNAME }} -p ${{ secrets.HARBOR_PASSWORD }} harbor.evanshome.io
-
-    - name: Push Docker image to Harbor
-      run: docker push harbor.evanshome.io/library/py-eagle-mqtt:dev
-      

.gitea/workflows/semantic-release.yaml

@@ -1,63 +1,64 @@
-name: Semantic Release and Changelog
+name: ci
-run-name: ${{ gitea.actor }} is running Semantic Release
+
 on:
+  schedule:
+    - cron: "0 10 * * *"
   push:
     branches:
-      - 'master'
+      - "**"
+    tags:
+      - "v*.*.*"
+  pull_request:
+    branches:
+      - "main"
 
 jobs:
-  Patch:
+  docker:
-    name: Patch
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-        fetch-depth: '0'
+          # list of Docker images to use as base name for tags
-    - name: Minor version for each merge
+          images: |
-      id: taggerDryRun
+            harbor.evanshome.io/library/py-eagle-mqtt       
-      uses: anothrNick/github-tag-action@1.67.0
+          # generate Docker tags based on the following events/attributes
-      env:
+          tags: |
-        GITHUB_TOKEN: ${{ secrets.REPO_PUSH_TOKEN }}
+            type=schedule
-        WITH_V: true
+            type=ref,event=branch
-        DRY_RUN: true
+            type=ref,event=pr
+            type=semver,pattern={{raw}}
+            type=semver,pattern={{version}}
+            type=sha            
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Harbor
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: harbor.evanshome.io
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
 
       - name: echo new tag
         run: |
-        echo "The next tag version will be: ${{ steps.taggerDryRun.outputs.new_tag }}"
+          echo "${{ steps.meta.outputs.tags }}"        
-    - name: echo tag
+        
-      run: |
+
-        echo "The current tag is: ${{ steps.taggerDryRun.outputs.tag }}"
+      # - name: Build and push
-    - name: echo part
+      #   uses: docker/build-push-action@v5
-      run: |
+      #   with:
-        echo "The version increment was: ${{ steps.taggerDryRun.outputs.part }}"
+      #     context: ./Docker/
+      #     push: ${{ github.event_name != 'pull_request' }}
+      #     tags: ${{ steps.meta.outputs.tags }}
+      #     labels: ${{ steps.meta.outputs.labels }}
+
 
-  Build-and-Publish:
-    name: Build and Publish
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4.1.1
 
-    - name: Login to Harbor 
-      uses: docker/login-action@v2
-      with:
-        registry: harbor.evanshome.io
-        username: "robot$registry-bot"
-        password: ${{ secrets.HARBOR_PASSWORD }}
 
-    - name: Build Docker image
-      run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:latest ./Docker/
 
-    - name: Minor version for each merge
-      id: taggerFinal
-      uses: anothrNick/github-tag-action@1.67.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.REPO_PUSH_TOKEN }}
-        WITH_V: true
-        GIT_API_TAGGING: false
 
-    - name: tag with name
-      run: docker tag  harbor.evanshome.io/library/py-eagle-mqtt:latest harbor.evanshome.io/library/py-eagle-mqtt:${{ steps.taggerFinal.outputs.new_tag }}
 
-    - name: Push Docker image to Harbor
-      run: docker push --all-tags harbor.evanshome.io/library/py-eagle-mqtt

.gitea/workflows/tag-release.yaml

@@ -0,0 +1,25 @@
+name: Bump version
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+
+jobs:
+  create_release_tag:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4.1.1
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
+          fetch-depth: '0'
+      
+      - name: Create Release Tag
+        id: taggerFinal
+        uses: anothrNick/github-tag-action@1.67.0
+        with:
+         GITHUB_TOKEN: ${{ secrets.REPO_PUSH_TOKEN }}
+         WITH_V: true
+         GIT_API_TAGGING: false

.gitlab-ci.yml

@@ -31,7 +31,7 @@ build:
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
 
 release:
-  image: node:20.10.0-alpine3.18
+  image: node:20.11.1-alpine3.18
   stage: release
   only:
     refs:

Docker/Dockerfile

@@ -28,6 +28,6 @@ RUN apk --update add --no-cache logrotate && \
 
 COPY . /app
 
-CMD ["python3", "-u", "/app/src/bin/tHome-eagle.py", "-c", "/app/src/conf"]
+CMD ["python3", "-u", "/app/src/bin/tHome-eagle.py", "-c", "/app/src/conf", "-l", "stdout"]
 
 EXPOSE 22042

Docker/requirements.txt

@@ -1,3 +1,3 @@
-paho-mqtt==1.6.1
+paho-mqtt==2.0.0
 bottle==0.12.25
 defusedxml==0.7.1

Docker/src/bin/dbg-msgHub.py

@@ -26,7 +26,7 @@ class Client ( mqtt.Client ):
       self.on_connect = Client.on_connect
       self.on_message = Client.on_message
       
-   def on_connect( self, userData, flags, rc ):
+   def on_connect( self, userdata, flags, reason_code, properties ):
       self.subscribe( '#' )
 
    def on_message( self, userData, msg ):
@@ -62,4 +62,4 @@ client.loop_start()
 while True:
    pass
 
-client.loop_stop( force=True )
+client.loop_stop()

Docker/src/python/tHome/broker/connect.py

@@ -11,7 +11,7 @@ class Client( mqtt.Client ):
    """Logging client
    """
    def __init__( self, log=None ):
-      mqtt.Client.__init__( self )
+      mqtt.Client.__init__( self, mqtt.CallbackAPIVersion.VERSION2 )
       self._logger = log
       # Restore callbacks overwritten by stupid mqtt library
       self.on_log = Client.on_log