Skip to content

Conversation

Jai-JAP
Copy link
Contributor

@Jai-JAP Jai-JAP commented Apr 6, 2022

Fixes Windows arm64 builds and probably doesnt break windows x64 builds
Artifacts here

@Jai-JAP
Copy link
Contributor Author

Jai-JAP commented Apr 6, 2022

To be tested on Windows machines

@Eugeny
Copy link
Owner

Eugeny commented Apr 9, 2022

x64 build is still broken - shouldn't the $ARCH actually be x64 instead of x86_64 here? That's what process.arch is on x64 Windows.

@Jai-JAP
Copy link
Contributor Author

Jai-JAP commented Apr 9, 2022

https://github.com/Jai-JAP/tabby/actions/runs/2141322690
@Eugeny can you test these new build artifacts

GitHub
A terminal for a more modern age. Contribute to Jai-JAP/tabby development by creating an account on GitHub.

@Jai-JAP
Copy link
Contributor Author

Jai-JAP commented Apr 9, 2022

https://github.com/Jai-JAP/tabby/actions/runs/2141391555

Here are the latest builds

GitHub
A terminal for a more modern age. Contribute to Jai-JAP/tabby development by creating an account on GitHub.

@Eugeny
Copy link
Owner

Eugeny commented Apr 9, 2022

31f549f works on Windows x64

@Eugeny
Copy link
Owner

Eugeny commented Apr 9, 2022

579b602 broke it again, the new condition is equivalent to

process.env.ARCH = (process.env.ARCH || (process.arch === 'arm')) ? 'armv7l' : process.arch``` and always returns `armv7l`

@Eugeny
Copy link
Owner

Eugeny commented Apr 9, 2022

Shouldn't it be just process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch ?

@Jai-JAP
Copy link
Contributor Author

Jai-JAP commented Apr 10, 2022

Shouldn't it be just process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch ?

I will commit this and again can you try the build as my windows system is broken

@Jai-JAP
Copy link
Contributor Author

Jai-JAP commented Apr 10, 2022

Also fixed the same in build-linux.js

@Jai-JAP
Copy link
Contributor Author

Jai-JAP commented Apr 10, 2022

Aftifacts
Fix build-native.js
Fix build-linux.js

@Jai-JAP
Copy link
Contributor Author

Jai-JAP commented Apr 10, 2022

@Eugeny Have you tested the Mac OS x86_64 builds as they may also have the same issue as mentioned in #6106 (comment)

@Jai-JAP
Copy link
Contributor Author

Jai-JAP commented Apr 10, 2022

Windows x64 build is tested working on my friend's PC
Windows arm64 has to be tested however

@Eugeny
Copy link
Owner

Eugeny commented Apr 10, 2022

macOS x64 confirmed working

@Jai-JAP
Copy link
Contributor Author

Jai-JAP commented Apr 11, 2022

Ok then...
Ready to merge

@Eugeny Eugeny merged commit 61810da into Eugeny:master Apr 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants