Skip to content

Fix Windows Builds #6106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 15, 2022
Merged

Fix Windows Builds #6106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
49934ae
Update build.yml
Jai-JAP Apr 6, 2022
1a37ba2
Update build-native.js
Jai-JAP Apr 6, 2022
3287f41
Update build.yml
Jai-JAP Apr 6, 2022
f18c583
Update build-native.js
Jai-JAP Apr 6, 2022
31f549f
Update build.yml
Jai-JAP Apr 9, 2022
579b602
Update build-native.js
Jai-JAP Apr 9, 2022
e303621
Update build-native.js
Jai-JAP Apr 10, 2022
086c4e6
Update build-linux.js
Jai-JAP Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ jobs:
strategy:
matrix:
include:
- arch: x86_64
- arch: x64
- arch: arm64

steps:
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-linux.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']) {
Expand Down