Merge branch 'eclipse:develop' into develop

.github/workflows/coverity-scan.yml

@@ -0,0 +1,24 @@
+name: Coverity Scan fixes and develop branches on a weekly basis
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "7 3 * * 0"
+
+jobs:
+  coverity:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Dependencies
+      run: sudo apt-get install -y libcjson-dev libsqlite3-dev libssl-dev uthash-dev
+
+    - uses: vapier/coverity-scan-action@v1
+      with:
+        build_language: 'cxx'
+        project: "eclipse/mosquitto"
+        token: ${{ secrets.COVERITY_SCAN_TOKEN }}
+        email: ${{ secrets.COVERITY_SCAN_EMAIL }}
+        command: "make binary"
+

.github/workflows/covsync.yml

@@ -1,21 +0,0 @@
-name: "Synchronise Coverity Scan branches on a weekly basis"
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "7 3 * * 0"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - run: |
-          git checkout coverity-fixes
-          git reset --hard origin/fixes
-          git push origin coverity-fixes
-          git checkout coverity-develop
-          git reset --hard origin/develop
-          git push origin coverity-develop