From ac348910da846134a922de77927aae78e2a8efc8 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sun, 25 Apr 2021 08:48:32 +0200
Subject: [PATCH] CI: Fix Snap build

---
 .gitlab-ci.yml                 | 57 +++++++++++++++-------------------
 scripts/publish-snap-edge.sh   |  2 +-
 scripts/publish-snap-stable.sh |  2 +-
 snap/snapcraft.yaml            |  2 --
 4 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4c49c1c..fec1d488 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,39 +167,32 @@ build_linux:
     paths:
       - build/linux/release/bundle/
 
-#snap:edge:
-#  stage: release
-#  image: "snapcore/snapcraft"
-#  before_script:
-#    - apt update && apt install git curl unzip clang cmake build-essential ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev -y
-#    - git clone https://github.com/flutter/flutter.git
-#    - export PATH="$PATH:`pwd`/flutter/bin"
-#  variables:
-#    SNAPCRAFT_LOGIN_FILE: ${SNAPCRAFT_LOGIN_FILE}
-#  only:
-#    - main
-#  script: [./scripts/publish-snap-edge.sh]
-#  needs: ["build_linux"]
-#  dependencies: ["build_linux"]
-#  artifacts:
-#    paths:
-#      - "./*.snap"
-#    when: on_success
+snap:edge:
+  stage: release
+  image: "snapcore/snapcraft"
+  variables:
+    SNAPCRAFT_LOGIN_FILE: ${SNAPCRAFT_LOGIN_FILE}
+  only: [main]
+  script: [./scripts/publish-snap-edge.sh]
+  needs: ["build_linux"]
+  dependencies: ["build_linux"]
+  artifacts:
+    paths:
+      - "./*.snap"
+    when: on_success
 
-#snap:publish:
-#  stage: release
-#  image: "snapcore/snapcraft"
-#  variables:
-#    SNAPCRAFT_LOGIN_FILE: ${SNAPCRAFT_LOGIN_FILE}
-#  only:
-#    - tags
-#  script: [./scripts/publish-snap-stable.sh]
-#  needs: ["build_linux"]
-#  artifacts:
-#    paths:
-#      - "./*.snap"
-#    when: on_success
-#    expire_in: 1 week
+snap:publish:
+  stage: release
+  image: "snapcore/snapcraft"
+  variables:
+    SNAPCRAFT_LOGIN_FILE: ${SNAPCRAFT_LOGIN_FILE}
+  only: [tags]
+  script: [./scripts/publish-snap-stable.sh]
+  needs: ["build_linux"]
+  artifacts:
+    paths:
+      - "./*.snap"
+    when: on_success
 
 update-dependencies:
   stage: coverage
diff --git a/scripts/publish-snap-edge.sh b/scripts/publish-snap-edge.sh
index 6f81b29d..db964847 100755
--- a/scripts/publish-snap-edge.sh
+++ b/scripts/publish-snap-edge.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -ve
-snapcraft
+snapcraft remote-build
 echo $SNAPCRAFT_LOGIN_FILE | base64 --decode --ignore-garbage > snapcraft.login
 snapcraft login --with snapcraft.login
 snapcraft push --release=edge *.snap
diff --git a/scripts/publish-snap-stable.sh b/scripts/publish-snap-stable.sh
index 939d70d0..8fb0ceb6 100755
--- a/scripts/publish-snap-stable.sh
+++ b/scripts/publish-snap-stable.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -ve
-snapcraft
+snapcraft remote-build
 echo $SNAPCRAFT_LOGIN_FILE | base64 --decode --ignore-garbage > snapcraft.login
 snapcraft login --with snapcraft.login
 snapcraft push --release=stable *.snap
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7ec0a528..328c8862 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -22,7 +22,6 @@ description: |
 
 grade: stable
 confinement: strict
-icon: assets/logo.png
 
 parts:
   olm:
@@ -37,7 +36,6 @@ parts:
     source: ./build/linux/release/bundle/
     stage-packages:
       - libsqlite3-dev
-      #- libolm-dev # Not available in core18
 
 slots:
   dbus-svc: