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

Travis: Back to latest emsdk, use embedded mode properly #40567

Merged
merged 1 commit into from
Jul 21, 2020

Conversation

akien-mga
Copy link
Member

Reverts and supersedes #39168 and #40563.

@akien-mga akien-mga added enhancement 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
@sbc100
Copy link

sbc100 commented Jul 21, 2020

Yup that works, assuming the environment variables from the install phase carry over to the build phase.

Ideally you wouldn't need to parse the config file at all, since the config format itself kind of an implementation detail. I'll see if I can come up with PR as a suggestion.

I think the best way to find is just to look in PATH.. emsdk_env.sh should put it there.

It looks like you are also needing to find "node_modules", ".bin", "google-closure-compiler" relative to emscripten root... For this I would just find emcc then assume node_modules lives alongside it.

@sbc100
Copy link

sbc100 commented Jul 21, 2020

I think it would be best to avoid exec(f.read(), em_config) if possible.

@akien-mga
Copy link
Member Author

Thanks, that's good feedback! I'll copy this to a dedicated issue as this PR in itself should be good to merge as is, it fixes the Travis CI setup which was previously missing the emsdk_env.sh call.

@akien-mga akien-mga merged commit 41d6c96 into godotengine:master Jul 21, 2020
@akien-mga akien-mga deleted the travis-emscripten-latest branch July 21, 2020 18:11
@akien-mga
Copy link
Member Author

Copied to #40574.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jul 24, 2020
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.

2 participants