From 02755e75998e99b5e7346f8a1441e8f30b41aca5 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sat, 18 Dec 2021 01:24:22 +0100
Subject: [PATCH] fix: build differently so arm64 can be generated (#946)

---
 .github/workflows/linux.yml                         | 10 +++++++---
 stores/snapcraft/build.sh                           | 13 +++++++++++++
 stores/snapcraft/check_deploy.sh                    |  2 ++
 stores/snapcraft/deploy.sh                          |  6 ++++++
 .../snapcraft/{snap => }/local/bin/electron-launch  |  0
 stores/snapcraft/{snap => }/snapcraft.yaml          |  2 +-
 6 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100755 stores/snapcraft/build.sh
 rename stores/snapcraft/{snap => }/local/bin/electron-launch (100%)
 rename stores/snapcraft/{snap => }/snapcraft.yaml (99%)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 2a3e3f3..1fa32d2 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -109,10 +109,14 @@ jobs:
       - name: Check deploy
         run: ./stores/snapcraft/check_deploy.sh
 
-      - name: Build snap
-        uses: snapcore/action-build@v1
+      - name: Install Snapcraft with LXD
+        uses: samuelmeuli/action-snapcraft@v1
         with:
-          path: stores/snapcraft
+          use_lxd: true
+        if: env.SHOULD_DEPLOY == 'yes'
+
+      - name: Build snap
+        run: ./stores/snapcraft/build.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
       - name: Publish snap
diff --git a/stores/snapcraft/build.sh b/stores/snapcraft/build.sh
new file mode 100755
index 0000000..ff44e8e
--- /dev/null
+++ b/stores/snapcraft/build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+CALLER_DIR=$( pwd )
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+sg lxd -c 'snapcraft --use-lxd'
+
+ls -la
+
+cd "${CALLER_DIR}"
diff --git a/stores/snapcraft/check_deploy.sh b/stores/snapcraft/check_deploy.sh
index 45c45c0..531d055 100755
--- a/stores/snapcraft/check_deploy.sh
+++ b/stores/snapcraft/check_deploy.sh
@@ -21,6 +21,8 @@ else
   GH_VERSION=$(jq -r 'sort_by(.tag_name)|last.tag_name' gh_latest.json)
   echo "GH version: ${GH_VERSION}"
 
+  rm -f snap_latest.json gh_latest.json
+
   if [[ "${SNAP_VERSION}" == "${GH_VERSION}" ]]; then
     export SHOULD_DEPLOY="no"
   else
diff --git a/stores/snapcraft/deploy.sh b/stores/snapcraft/deploy.sh
index 74d812a..ea0126f 100755
--- a/stores/snapcraft/deploy.sh
+++ b/stores/snapcraft/deploy.sh
@@ -2,8 +2,14 @@
 
 set -e
 
+CALLER_DIR=$( pwd )
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
 echo "$SNAP_STORE_LOGIN" | snapcraft login --with -
 
 snapcraft upload --release=stable *.snap
 
 snapcraft logout
+
+cd "${CALLER_DIR}"
diff --git a/stores/snapcraft/snap/local/bin/electron-launch b/stores/snapcraft/local/bin/electron-launch
similarity index 100%
rename from stores/snapcraft/snap/local/bin/electron-launch
rename to stores/snapcraft/local/bin/electron-launch
diff --git a/stores/snapcraft/snap/snapcraft.yaml b/stores/snapcraft/snapcraft.yaml
similarity index 99%
rename from stores/snapcraft/snap/snapcraft.yaml
rename to stores/snapcraft/snapcraft.yaml
index 5a0380d..9517414 100644
--- a/stores/snapcraft/snap/snapcraft.yaml
+++ b/stores/snapcraft/snapcraft.yaml
@@ -73,7 +73,7 @@ parts:
     after:
       - codium
     plugin: dump
-    source: snap/local
+    source: local
 
 apps:
   codium: