From 9e0f9f5d23a18a2ed8bb680898b8f8a879027a85 Mon Sep 17 00:00:00 2001
From: Krille <christian-pauly@posteo.de>
Date: Sat, 15 Jul 2023 17:46:13 +0900
Subject: [PATCH] CI: Only promote snap but let launchpad build

---
 .github/workflows/main_deploy.yaml | 12 ------------
 .github/workflows/release.yaml     | 14 +++++++++-----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml
index f2726c3a6..96d328d7c 100644
--- a/.github/workflows/main_deploy.yaml
+++ b/.github/workflows/main_deploy.yaml
@@ -44,18 +44,6 @@ jobs:
           publish_dir: ./public
           publish_branch: gh-pages
 
-  deploy_snapcraft_edge:
-    runs-on: ubuntu-latest
-    env:
-      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v3
-      - uses: snapcore/action-build@v1
-        id: snapcraft
-      - name: Publish Snap
-        run: snapcraft push ./*.snap
-
   deploy_playstore_internal:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 1798ac091..83d5afb7b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -76,19 +76,23 @@ jobs:
       - name: Create archive
         run: tar -czf fluffychat-linux-${{ matrix.architecture }}-${{ github.ref }}.tar.gz build/linux/${{ matrix.architecture }}/release/bundle/
 
-  deploy_snapcraft:
+  promote_snapcraft:
     runs-on: ubuntu-latest
     env:
       SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v3
-      - uses: snapcore/action-build@v1
-        id: snapcraft
-      - name: Publish Snap
-        run: snapcraft push ./*.snap
+      - name: Install Snapcraft with LXD
+        uses: samuelmeuli/action-snapcraft@v2
+        with:
+          use_lxd: ${{ matrix.os == 'ubuntu-18.04' }}
       - name: Promote Snap
+        env:
+          SNAPCRAFT_TOKEN: ${{ secrets.SNAPCRAFT_TOKEN }}
         run: |
+          echo "${{ SNAPCRAFT_TOKEN }}" >> snapcrafttoken.txt
+          snapcraft login --with snapcrafttoken.txt
           RELEASE_TYPE=$(echo "${{ github.ref }}" | awk -F"/" '{print $3}')
           if [ "$RELEASE_TYPE" = "rc" ]; then
               snapcraft promote fluffychat --from-channel edge --to-channel candidate