Преглед на файлове

fix: build differently so arm64 can be generated (#946)

Baptiste Augrain преди 3 години
родител
ревизия
02755e7599

+ 7 - 3
.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

+ 13 - 0
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}"

+ 2 - 0
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

+ 6 - 0
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}"

+ 0 - 0
stores/snapcraft/snap/local/bin/electron-launch → stores/snapcraft/local/bin/electron-launch


+ 1 - 1
stores/snapcraft/snap/snapcraft.yaml → stores/snapcraft/snapcraft.yaml

@@ -73,7 +73,7 @@ parts:
     after:
       - codium
     plugin: dump
-    source: snap/local
+    source: local
 
 apps:
   codium: