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.

Sign up for GitHub

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

Jump to bottom

Travis: Pin Emscripten version to 1.39.19 #40563

Merged
merged 1 commit into from
Jul 21, 2020
Merged

Travis: Pin Emscripten version to 1.39.19 #40563

merged 1 commit into from
Jul 21, 2020

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Jul 21, 2020 •
edited
Loading

1.39.20 dropped support for the no-embedded mode we use since #39168,
as our detection logic hasn't been fixed yet to support the embedded
mode. (Support actually removed from emsdk in emscripten-core/emsdk#510.)

This is just a temporary hack, we should implement support for the embedded mode.

@akien-mga akien-mga added platform:web topic:buildsystem cherrypick:3.x Considered for cherry-picking into a future 3.x release labels Jul 21, 2020
@akien-mga akien-mga added this to the 4.0 milestone Jul 21, 2020
@akien-mga
Travis: Pin Emscripten version to 1.39.19
ca32585 
1.39.20 dropped support for the no-embedded mode we use since godotengine#39168,
as our detection logic hasn't been fixed yet to support the embedded
mode.
@akien-mga akien-mga force-pushed the travis-pin-emscripten-1.39.19 branch from d1713ab to ca32585 Compare July 21, 2020 08:04
@akien-mga akien-mga merged commit fa3ac7d into godotengine:master Jul 21, 2020
@akien-mga akien-mga deleted the travis-pin-emscripten-1.39.19 branch July 21, 2020 09:07
@sbc100
Copy link

sbc100 commented Jul 21, 2020

Ooops, I'm sorry I broke you there.

If I can offer any assistance switching to supporting embedded mode please let me know. If necessary we can also temporarily revert the emsdk change.

@akien-mga
Copy link
Member Author

@sbc100 No worry, it's good for Emscripten to keep going forwards :)

It should be fairly easy to adapt our detection code, we just forgot to do it as we hid the problem with #39168 instead of handling it (but we can only blame ourselves for using a latest version on CI builds).

If you're curious, the relevant code is here:

godot/platform/javascript/detect.py

Lines 14 to 15 in 01fb1f1

def can_build():
return "EM_CONFIG" in os.environ or os.path.exists(os.path.expanduser("~/.emscripten"))

@akien-mga
Copy link
Member Author

akien-mga commented Jul 21, 2020 •
edited
Loading

Actually, it seems to work fine in embedded mode out of the box for me, I guess we simply don't need the --no-embedded hack anymore? Maybe @Faless fixed our buildsystem already and we forgot to update the CI.

Edit: Nevermind, I source emsdk_env.sh in my ~/.bashrc. I'll fix the CI to do the same.

akien-mga added a commit to akien-mga/godot that referenced this pull request Jul 21, 2020
@akien-mga
Travis: Back to latest emsdk, use embedded mode properly
15917ee 
Reverts and supersedes godotengine#39168 and godotengine#40563.
@akien-mga akien-mga mentioned this pull request Jul 21, 2020
Merged
@akien-mga
Copy link
Member Author

This should be a better setup: #40567.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jul 21, 2020
@akien-mga akien-mga mentioned this pull request Jul 31, 2020
Merged
akien-mga added a commit to akien-mga/godot that referenced this pull request Jul 31, 2020
@akien-mga
CI: Pin Emscripten version for reproducible builds
bfd5226 
Emscripten is a fast-moving target which gets tons of improvements all the time,
but it's not rare that some regressions affect us and make our CI builds fail.
(See e.g. godotengine#33728, godotengine#35237, godotengine#39168, godotengine#40563, and godotengine#40914.)

Let's pin to a stable version to avoid having external factors impact our CI,
and update this version manually regularly in a PR to ensure that the new
version works well for us.
MarcusElg pushed a commit to MarcusElg/godot that referenced this pull request Oct 19, 2020
@akien-mga @MarcusElg
Travis: Back to latest emsdk, use embedded mode properly
97b33a7 
Reverts and supersedes godotengine#39168 and godotengine#40563.
MarcusElg pushed a commit to MarcusElg/godot that referenced this pull request Oct 19, 2020
@akien-mga @MarcusElg
CI: Pin Emscripten version for reproducible builds
1b7c89d 
Emscripten is a fast-moving target which gets tons of improvements all the time,
but it's not rare that some regressions affect us and make our CI builds fail.
(See e.g. godotengine#33728, godotengine#35237, godotengine#39168, godotengine#40563, and godotengine#40914.)

Let's pin to a stable version to avoid having external factors impact our CI,
and update this version manually regularly in a PR to ensure that the new
version works well for us.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Faless Faless Awaiting requested review from Faless

@madmiraal madmiraal Awaiting requested review from madmiraal

Assignees
No one assigned
Labels
platform:web topic:buildsystem
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.
2 participants
@akien-mga @sbc100