fix(electron/windows): build windows on linux #1818
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1818 +/- ##
======================================
Coverage 32% 32%
======================================
Files 45 45
Lines 2609 2609
Branches 337 337
======================================
Hits 859 859
Misses 1750 1750
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
| @@ -74,13 +74,10 @@ jobs: | |||
|
|
|||
| windows_debug_build: | |||
| name: Windows Debug Build | |||
| runs-on: windows-2019 | |||
| runs-on: ubuntu-20.04 | |||
| timeout-minutes: 10 | |||
There was a problem hiding this comment.
nit we might need to increase this timeout because we've experienced timeouts when building Windows in the past. it's OK to increase it in another PR.
|
The job is failing: |
@fortuna this will require us to install wine every time, which seems like it could take awhile: https://wiki.winehq.org/Ubuntu Here are some options on how to proceed. I could: I prefer C, but I don't know if you have any concerns I'm not aware of. |
@fortuna this PR isn't working yet, need you to weigh in here on how to proceed. Are you okay with option C? |
|
How do we currently built out for release? I don’t remember needing wine.
And how would the node script help?
I like the idea of the CI doing what e we do for release.
…On Fri, Jan 12, 2024 at 8:54 PM Daniel LaCosse ***@***.***> wrote:
The job is failing:
⨯ wine is required, please see https://electron.build/multi-platform-build#linux
@fortuna <https://github.com/fortuna> this will require us to install
wine every time, which seems like it could take awhile:
https://wiki.winehq.org/Ubuntu
I could: a) install wine b) switch back to the node scripts I wrote that
already fixes this problem c) in the tun2socks/build.action.mjs, run go
build if the os matches the target platform - otherwise call the makefile
I prefer C, but I don't know if you have any concerns I'm not aware of.
@fortuna <https://github.com/fortuna> this PR isn't working yet, need to
to weigh in here on how to proceed. Are you okay with option C?
—
Reply to this email directly, view it on GitHub
<#1818 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAA3XHPQQCBBPLFLRHGNDP3YOHSOTAVCNFSM6AAAAABBW3P772VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQOJQGI2DONJUG4>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
The issue is with cross-platform compilation. If we're going to use the Linux runner, we need to install Wine. If we're going to use the Windows runner, we can't use XGO. It's easiest to detect the platform the script is being run on in Node. |
|
This is how we do conditional build in the CI for the SDK: We can do the same here. My suggestion:
|
|
I guess my answer doesn't really address the fact that the Makefile doesn't let you do that. Yes, option C makes sense
|
* fix(electron/windows): build windows on linux * use go build when the target and host platforms match [WIP] * oops * scope to electron * revert windows job changes * lol ai * fix path * resolve current platform
…y version (#1816) * attempt #1 * unzip jni * fix(electron/windows): build windows on linux (#1818) * fix(electron/windows): build windows on linux * use go build when the target and host platforms match [WIP] * oops * scope to electron * revert windows job changes * lol ai * fix path * resolve current platform * change gradle filepath * remove jni
No description provided.