fix(snap): build

.github/workflows/insider-linux.yml

@@ -244,25 +244,25 @@ jobs:
         run: ./stores/snapcraft/build.sh
         if: env.SHOULD_BUILD == 'yes'
 
-      # - uses: diddlesnaps/snapcraft-multiarch-action@v1
+      - uses: diddlesnaps/snapcraft-multiarch-action@v1
-      #   with:
-      #     path: stores/snapcraft/out
-      #     architecture: ${{ matrix.platform }}
-      #   id: build
-      #   if: env.SHOULD_BUILD == 'yes'
-
-      - uses: snapcore/action-build@v1
         with:
           path: stores/snapcraft/out
+          architecture: ${{ matrix.platform }}
         id: build
         if: env.SHOULD_BUILD == 'yes'
 
-      # - uses: diddlesnaps/snapcraft-review-action@v1
+      # - uses: snapcore/action-build@v1
       #   with:
-      #     snap: ${{ steps.build.outputs.snap }}
+      #     path: stores/snapcraft/out
-      #     isClassic: 'true'
+      #   id: build
       #   if: env.SHOULD_BUILD == 'yes'
 
+      - uses: diddlesnaps/snapcraft-review-action@v1
+        with:
+          snap: ${{ steps.build.outputs.snap }}
+          isClassic: 'true'
+        if: env.SHOULD_BUILD == 'yes'
+
       - uses: svenstaro/upload-release-action@v2
         with:
           repo_name: ${{ env.ASSETS_REPOSITORY }}

prepare_assets.sh

@@ -139,6 +139,10 @@ else
 
   cd ..
 
+  if [[ "${CI_BUILD}" == "no" ]]; then
+    . ./stores/snapcraft/build.sh
+  fi
+
   if [[ "${SHOULD_BUILD_TAR}" != "no" ]]; then
     echo "Building and moving TAR"
     cd "VSCode-linux-${VSCODE_ARCH}"

stores/snapcraft/build.sh

@@ -20,7 +20,7 @@ rm -rf build
 mkdir -p build/snap/gui
 
 if [[ "${CI_BUILD}" == "no" ]]; then
-  DEB_ARCHIVE=$( ls ../../vscode/build/linux/deb/amd64/deb/*.deb )
+  DEB_ARCHIVE=$( ls ../../vscode/.build/linux/deb/amd64/deb/*.deb )
 else
   # Get GitHub releases
   wget --quiet "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases" -O gh_latest.json
@@ -37,8 +37,8 @@ fi
 # Unpacking .deb
 dpkg -x "${DEB_ARCHIVE}" build/deb
 
-mkdir -p build/snap/usr/share
+mkdir -p build/snap/local/usr/share
-mv "build/deb/usr/share/${BINARY_NAME}" "build/snap/usr/share/${BINARY_NAME}"
+mv "build/deb/usr/share/${BINARY_NAME}" "build/snap/local/usr/share/${BINARY_NAME}"
 
 # Prepare snapcraft.yaml
 cp ${VSCODE_QUALITY}/snapcraft.yaml build/snap/snapcraft.yaml
@@ -47,7 +47,7 @@ replace "s|@@SNAP_NAME@@|${BINARY_NAME}|g" build/snap/snapcraft.yaml
 replace "s|@@SNAP_VERSION@@|${SNAP_VERSION}|g" build/snap/snapcraft.yaml
 
 # Prepare electron-launch
-cp ${VSCODE_QUALITY}/electron-launch build/snap/electron-launch
+cp ${VSCODE_QUALITY}/electron-launch build/electron-launch
 
 # Prepare GUI
 cp "../../src/${VSCODE_QUALITY}/resources/linux/code.png" "build/snap/gui/${BINARY_NAME}.png"

stores/snapcraft/insider/snapcraft.yaml

@@ -55,7 +55,7 @@ parts:
       - patchelf
     override-build: |
       snapcraftctl build
-      patchelf --force-rpath --set-rpath '$ORIGIN/../../lib/x86_64-linux-gnu:$ORIGIN:/snap/core20/current/lib/x86_64-linux-gnu' $SNAPCRAFT_PART_INSTALL/snap/usr/share/@@SNAP_NAME@@/chrome_crashpad_handler
+      patchelf --force-rpath --set-rpath '$ORIGIN/../../lib/x86_64-linux-gnu:$ORIGIN:/core20/current/lib/x86_64-linux-gnu' $SNAPCRAFT_PART_INSTALL/snap/usr/share/@@SNAP_NAME@@/chrome_crashpad_handler
 
   cleanup:
     after: