Skip to content
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(common): allow build agents to automatically select emsdk version, and enable support for 3.1.60+ 🍒 🏠 #12245

Merged

Conversation

mcdurdin
Copy link
Member

@mcdurdin mcdurdin commented Aug 21, 2024

The build agents will now automatically install and activate the Emscripten version found in minimum-versions.inc.sh when configuring WASM projects. For developer machines, this behaviour can be enabled by setting the environment variable KEYMAN_USE_EMSDK (recommended).

Also, Emscripten 3.1.60 made a breaking change to BindingType::toWireType (why is this done in a patch version?) so this change ensures that we can continue to build on 3.1.58 and 3.1.64 (which is needed for #12234), as a bridging strategy.

Relates-to: emscripten-core/emscripten#21692
Relates-to: #12234
Cherry-pick-of: #12243
Cherry-pick-of: #12235

@keymanapp-test-bot skip

Emscripten 3.1.60 made a breaking change to `BindingType::toWireType`
(why is this done in a patch version?) so this change ensures that we
can continue to build on 3.1.58 and 3.1.64 (which is needed for #12234),
as a bridging strategy. We will need to merge this into 17.0-stable as
well so that we can upgrade the build agents to 3.1.64.

Relates-to: emscripten-core/emscripten#21692
Relates-to: #12234
The build agents will now automatically install and activate the
Emscripten version found in minimum-versions.inc.sh when configuring
WASM projects. For developer machines, this behaviour can be enabled by
setting the environment variable `KEYMAN_USE_EMSDK` (recommended).

Cherry-pick-of: #12243
@keymanapp-test-bot
Copy link

keymanapp-test-bot bot commented Aug 21, 2024

User Test Results

Test specification and instructions

User tests are not required

Test Artifacts

@keymanapp-test-bot keymanapp-test-bot bot changed the title chore(common): allow build agents to automatically select emsdk version, and enable support for 3.1.60+ 🍒 chore(common): allow build agents to automatically select emsdk version, and enable support for 3.1.60+ 🍒 🏠 Aug 21, 2024
@keymanapp-test-bot keymanapp-test-bot bot added this to the A18S9 milestone Aug 21, 2024
@github-actions github-actions bot added cherry-pick Change already merged into another (stable) branch chore stable labels Aug 21, 2024
@@ -1,31 +1,73 @@
# shellcheck shell=bash
# no hashbang for .inc.sh

KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.58
Copy link
Member Author

Choose a reason for hiding this comment

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

This is in minimum-versions.inc.sh in 18.0

This is a manual cherry-pick of #12235, for 17.0-stable.

Cherry-pick-of: #12235
@mcdurdin mcdurdin marked this pull request as ready for review August 21, 2024 14:11
@github-actions github-actions bot added the core/ Keyman Core label Aug 21, 2024
Copy link
Contributor

@darcywong00 darcywong00 left a comment

Choose a reason for hiding this comment

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

lgtm

@mcdurdin mcdurdin merged commit 5bdfc50 into stable-17.0 Aug 22, 2024
26 checks passed
@mcdurdin mcdurdin deleted the chore/developer/cherry-pick/emscripten-3.1.60-patch branch August 22, 2024 05:52
@keyman-server
Copy link
Collaborator

Changes in this pull request will be available for download in Keyman version 17.0.329

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick Change already merged into another (stable) branch chore common/resources/ Build infrastructure common/ core/ Keyman Core developer/compilers/ developer/ stable
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants