-
Notifications
You must be signed in to change notification settings - Fork 29.3k
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.
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
chore: update to electron 11 #110759
chore: update to electron 11 #110759
Conversation
- Compile | ||
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false')) | ||
pool: | ||
vmImage: macOS-latest |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For now we are cross-compiling but when ci supports native compilation, it will be using a different pool. Hence this is written as a separate stage.
f056162
to
86c32f1
Compare
@@ -191,9 +191,10 @@ | |||
"url": "https://github.com/microsoft/vscode/issues" | |||
}, | |||
"optionalDependencies": { | |||
"vscode-windows-ca-certs": "^0.3.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The version bump cannot be done in current master because of new napi version.
vmImage: macOS-latest | ||
jobs: | ||
- job: macOSARM64 | ||
condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS_ARM64'], 'true')) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Turning this off for now because internal mac arm builds are not available yet, there is active work to get a release out sometime next week.
efa785e
to
04787ef
Compare
package.json
Outdated
@@ -1,7 +1,7 @@ | |||
{ | |||
"name": "code-oss-dev", | |||
"version": "1.52.0", | |||
"distro": "e289d0d793bde8f8b5632625e01c50c218e7e127", | |||
"distro": "bedb1d87b28d90d8cf83deb8f334816a05980fb4", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just to fix conflicts with distro and get exploration builds out from this branch, will remove this before merging and fix conflicts on distro branch.
This is now ready for review, also last night's exploration release was made from this branch @bpasero - can you review the electron api changes Thanks! |
@@ -1,3 +1,3 @@ | |||
disturl "https://electronjs.org/headers" | |||
target "9.3.3" | |||
target "11.0.2" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we are not yet having internal builds for this right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yup, will merge once the builds are available, can expect them in beginning of next week.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Thanks!
} finally { | ||
store.done(); | ||
} | ||
assert(certCount > 0); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On a fresh Windows machine the cert store might have very few certificates because Edge downloads and adds to it on demand. Not sure if it can be empty, but if we see this test failing we need to consider that possibility.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
@deepak1556 looks like we can also remove this code now, no? vscode/src/vs/platform/windows/common/windows.ts Lines 129 to 132 in 38f55ec
|
Good catch, will remove it. Thanks! |
88c7381
to
0151976
Compare
@sbatten can you review c21f001 which addresses #110759 (comment) Reason for change: Electron has fixed the issue in electron/electron#26395 |
Electron release link - https://github.com/electron/electron/releases/tag/v11.0.2