Merging upstream version 2.5.

Signed-off-by: Daniel Baumann <daniel@debian.org>

.github/workflows/appimage.yml

@@ -22,13 +22,45 @@ jobs:
           python-version: '3.x'
       - uses: BSFishy/meson-build@v1.0.3
         with:
-          setup-options: --werror --buildtype=release --prefix=/usr
+          setup-options: >
+            --werror
+            --buildtype=release
+            --prefix=/usr
+            --force-fallback-for=libnvme
+            -Dlibnvme:werror=false
           action: install
+          meson-version: 0.61.2
       - name: build AppImage
         uses: AppImageCrafters/build-appimage@v1.3
         with:
           recipe: .github/AppImageBuilder.yml
       - uses: actions/upload-artifact@v3
+        name: upload artifacts to github
         with:
           name: AppImage
           path: '*.AppImage*'
+
+  deploy-appimage:
+    name: deploy AppImage
+    runs-on: ubuntu-latest
+    needs: build-appimage
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+    steps:
+      - name: Download artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: ${{ github.event.workflow_run.workflow_id }}
+          workflow_conclusion: success
+      - name: FTP Deployer
+        uses: sand4rt/ftp-deployer@v1.7
+        with:
+          sftp: true
+          host: ${{ secrets.SFTP_SERVER }}
+          port: 22
+          username: ${{ secrets.SFTP_USERNAME }}
+          password: ${{ secrets.SFTP_PASSWORD }}
+          remote_folder: '/upload'
+          local_folder: '.'
+          cleanup: false
+          include: '[ "*", "**/*" ]'
+          exclude: '[".github/**", ".git/**", "*.env"]'