Merge branch 'main' into weblate-fluffychat-translations

.github/workflows/main_deploy.yaml

@@ -78,18 +78,3 @@ jobs:
           bundle update fastlane
           bundle exec fastlane deploy_internal_test
           cd ..
-
-  deploy_snap:
-    runs-on: ubuntu-latest
-    outputs:
-      snap-file: ${{ steps.build-snap.outputs.snap }}
-    steps:
-    - uses: actions/checkout@v3
-    - uses: snapcore/action-build@v1
-      id: build-snap
-    - uses: snapcore/action-publish@v1
-      env:
-        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
-      with:
-        snap: ${{ steps.build-snap.outputs.snap }}
-        release: 'edge'

.github/workflows/release.yaml

@@ -143,26 +143,28 @@ jobs:
           fi
           cd ..
 
-  deploy_snap:
+  promote_snapcraft:
     runs-on: ubuntu-latest
-    if: false # Until snap is fixed
-    outputs:
-      snap-file: ${{ steps.build-snap.outputs.snap }}
+    env:
+      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: snapcore/action-build@v1
-        id: build-snap
-      - name: Set release type
-        id: set-release
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+      - name: Install Snapcraft
+        uses: samuelmeuli/action-snapcraft@v2
+      - run: snapcraft
+      - name: Install expect
+        run: sudo apt-get update && sudo apt-get install -y expect
+      - name: Promote Snap
         run: |
-          if [[ "${GITHUB_REF_NAME}" == rc* ]]; then
-            echo "::set-output name=release::candidate"
+          RELEASE_TYPE=$(echo "${{ github.ref }}" | awk -F"/" '{print $3}')
+          if [ "$RELEASE_TYPE" = "rc" ]; then
+              expect -c "
+              spawn snapcraft promote fluffychat --from-channel edge --to-channel candidate
+              expect \"Do you want to promote the current set to the 'candidate' channel? [y/N]:\"
+              send \"y\r\"
+              expect eof
+              "
           else
-            echo "::set-output name=release::stable"
-          fi
-      - uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
-        with:
-          snap: ${{ steps.build-snap.outputs.snap }}
-          release: ${{ steps.set-release.outputs.release }}
+              snapcraft promote fluffychat --from-channel candidate --to-channel stable --yes
+          fi

snap/snapcraft.yaml

@@ -59,6 +59,11 @@ parts:
     build-packages:
       - g++
 
+  zenity-integration:
+    plugin: nil
+    stage-snaps:
+      - zenity-integration
+
   fluffychat:
     plugin: flutter
     source: .