From 49934aea5d23517a2ccf708fb7e97aeee3024e08 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Wed, 6 Apr 2022 16:34:28 +0530 Subject: [PATCH 1/8] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de03ed1e..d2353e92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -261,7 +261,7 @@ jobs: npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} - name: Build - shell: powershell + shell: bash run: | npm i -g yarn@1.19.1 yarn --network-timeout 1000000 From 1a37ba224d707dafa9fc8de97857c392a58ff792 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Wed, 6 Apr 2022 16:35:38 +0530 Subject: [PATCH 2/8] Update build-native.js --- scripts/build-native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index 9ae47aea..9685efa1 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,7 @@ const rebuild = require('electron-rebuild').default const path = require('path') 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 = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From 3287f410b78fbf394353bcd5315e7f228db54611 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Wed, 6 Apr 2022 17:00:35 +0530 Subject: [PATCH 3/8] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2353e92..de03ed1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -261,7 +261,7 @@ jobs: npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} - name: Build - shell: bash + shell: powershell run: | npm i -g yarn@1.19.1 yarn --network-timeout 1000000 From f18c58360d96259ebe17d717bdfcfd742f36fd0d Mon Sep 17 00:00:00 2001 From: Jai A P Date: Wed, 6 Apr 2022 17:01:13 +0530 Subject: [PATCH 4/8] Update build-native.js --- scripts/build-native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index 9685efa1..fe432bc2 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,7 @@ const rebuild = require('electron-rebuild').default const path = require('path') 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 = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From 31f549f5bb8d20c331163a2f24b38fe6db7e7b84 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sat, 9 Apr 2022 22:38:39 +0530 Subject: [PATCH 5/8] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de03ed1e..3a6a2f57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -241,7 +241,7 @@ jobs: strategy: matrix: include: - - arch: x86_64 + - arch: x64 - arch: arm64 steps: From 579b60236b04156d3e42f6c16f5d5d334714022b Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sat, 9 Apr 2022 23:08:56 +0530 Subject: [PATCH 6/8] Update build-native.js --- scripts/build-native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index fe432bc2..9685efa1 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,7 @@ const rebuild = require('electron-rebuild').default const path = require('path') 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 = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From e303621fc51695b7037323505b71ef815a265463 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sun, 10 Apr 2022 17:30:29 +0530 Subject: [PATCH 7/8] Update build-native.js --- scripts/build-native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index 9685efa1..ee704559 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,7 @@ const rebuild = require('electron-rebuild').default const path = require('path') 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 = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From 086c4e68e6dec6091d9c33cc1e3028add3b13f81 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sun, 10 Apr 2022 17:32:08 +0530 Subject: [PATCH 8/8] Update build-linux.js --- scripts/build-linux.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index f8d91d6d..e2215a62 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -4,7 +4,7 @@ const vars = require('./vars') 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({ dir: true,