Merge pull request #6106 from Jai-JAP/master

This commit is contained in:
Eugeny 2022-04-15 12:32:55 +02:00 committed by GitHub
commit 61810da810
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View file

@ -241,7 +241,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- arch: x86_64 - arch: x64
- arch: arm64 - arch: arm64
steps: steps:

View file

@ -4,7 +4,7 @@ const vars = require('./vars')
const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
process.env.ARCH = process.env.ARCH || process.arch === 'arm' ? 'armv7l' : process.arch process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch
builder({ builder({
dir: true, dir: true,

View file

@ -3,7 +3,7 @@ const rebuild = require('electron-rebuild').default
const path = require('path') const path = require('path')
const vars = require('./vars') const vars = require('./vars')
process.env.ARCH = process.env.ARCH ?? (process.arch === 'arm' ? 'armv7l' : process.arch) process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch
let lifecycles = [] let lifecycles = []
for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) {