Skip to content

[v12] Update electron and electron-builder (#26072)#26334

Merged
gzdunek merged 3 commits intobranch/v12from
gzdunek/backport-26072-branch/v12
May 17, 2023
Merged

[v12] Update electron and electron-builder (#26072)#26334
gzdunek merged 3 commits intobranch/v12from
gzdunek/backport-26072-branch/v12

Conversation

@gzdunek
Copy link
Copy Markdown
Contributor

@gzdunek gzdunek commented May 16, 2023

Backport #26072 to branch/v12

* Upgrade electron and electron-builder

* Update the path to x64 build

* Update electron to 24.3.0

* Use the latest after-install and after-remove scripts

* Run prettier

* Use correct indentation

* Use app path in `update-alternatives --remove`

(cherry picked from commit a5679de)
@ravicious
Copy link
Copy Markdown
Member

@gzdunek Did you perhaps run a tag build for the v12 and v11 backports? They don't have universal builds AFAIR so I think it'd be worthwhile to do that.

Copy link
Copy Markdown
Member

@ravicious ravicious left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 if this builds on CI.

Comment thread yarn.lock Outdated
"@types/node" "*"

"@types/google-protobuf@^3.10.0", "@types/google-protobuf@^3.7.2":
"@types/google-protobuf@^3.10.0":
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we have dealt with that. 🤨

Edit: After I ran yarn on my laptop on this branch, it reverted back to what this commit removes.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, fixed.

@gzdunek
Copy link
Copy Markdown
Contributor Author

gzdunek commented May 17, 2023

v12 build https://drone.platform.teleport.sh/gravitational/teleport/24058 - there were some failures, but unrelated to Connect. I tested dmg and didn't see any problems.

@gzdunek gzdunek enabled auto-merge May 17, 2023 16:36
@gzdunek gzdunek added this pull request to the merge queue May 17, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 17, 2023
@gzdunek gzdunek added this pull request to the merge queue May 17, 2023
Merged via the queue into branch/v12 with commit 3825a8a May 17, 2023
@gzdunek gzdunek deleted the gzdunek/backport-26072-branch/v12 branch May 17, 2023 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants