Fixes

.github/workflows/build.yml

@@ -218,8 +218,6 @@ jobs:
         mv dist/*.rpm artifact-rpm/ || true
         mkdir artifact-pacman
         mv dist/*.pacman artifact-pacman/ || true
-        mkdir artifact-snap
-        mv dist/*.snap artifact-snap/ || true
         mkdir artifact-tar.gz
         mv dist/*.tar.gz artifact-tar.gz/ || true
         mkdir artifact-web
@@ -242,13 +240,6 @@ jobs:
       with:
         name: Linux Pacman (${{matrix.arch}})
         path: artifact-pacman
-      # if: ${{ matrix.arch == 'x86_64' }}
-
-    - uses: actions/upload-artifact@master
-      name: Upload Snap
-      with:
-        name: Linux Snap  (${{matrix.arch}})
-        path: artifact-snap
 
     - uses: actions/upload-artifact@master
       name: Upload Linux tarball

scripts/build-linux.js

@@ -15,7 +15,7 @@ builder({
         extraMetadata: {
             version: vars.version,
         },
-        npmRebuild: (process.env.ARCH !== 'arm64' && process.env.ARCH !== 'armv7l'),
+        npmRebuild: process.env.ARCH !== 'arm*',
     },
     publish: isTag ? 'always' : 'onTag',
 }).catch(() => process.exit(1))

scripts/build-native.js

@@ -3,12 +3,15 @@ const rebuild = require('electron-rebuild').default
 const path = require('path')
 const vars = require('./vars')
 
+process.env.ARCH = process.env.ARCH || process.arch
+if ( process.env.ARCH === 'arm' ) process.env.ARCH = 'armv7l' ;
+
 let lifecycles = []
 for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) {
     const build = rebuild({
         buildPath: path.resolve(__dirname, '../' + dir),
         electronVersion: vars.electronVersion,
-        arch: process.env.ARCH ?? process.arch,
+        arch: process.env.ARCH,
         force: true,
     })
     build.catch(e => {

scripts/build-windows.js

@@ -15,6 +15,7 @@ builder({
         extraMetadata: {
             version: vars.version,
         },
+        npmRebuild: process.env.ARCH !== 'arm64',
     },
     publish: isTag ? 'always' : 'onTag',
 }).catch(() => process.exit(1))