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

fix: improve Fish shell support (and Cshell) #1429

Merged
merged 1 commit into from
Aug 1, 2024

Conversation

mtb0x1
Copy link
Contributor

@mtb0x1 mtb0x1 commented Jul 24, 2024

I faced the same issue mentioned in #1299, this PR fixes the issue by taking in account specific set and unset syntax for Fish shell.

The post install instruction (i.e : ./emsdk activate latest) provides wrong instructions in Fish shell and Cshell cases.
This should be fixed by this PR too, although the code is a bit redundant and it could be more cleaner.

The website instruction have the same issue, but I guess user with specific shell will be able to manage.

@mtb0x1
Copy link
Contributor Author

mtb0x1 commented Jul 24, 2024

I am not sure why the test-linux ci failed, doesn't seem to be related to this PR.
Running the failed step ( test_binaryen_from_source) manually on my end works fine. a Ci timeout ?

emsdk.py Outdated Show resolved Hide resolved
emsdk.py Outdated Show resolved Hide resolved
emsdk.py Outdated Show resolved Hide resolved
emsdk.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@sbc100 sbc100 left a comment

Choose a reason for hiding this comment

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

Thanks for working on this. One last nit and we can submit I think

emsdk.py Outdated Show resolved Hide resolved
@sbc100
Copy link
Collaborator

sbc100 commented Jul 31, 2024

Looks like flake8 also found a couple of nits

@mtb0x1 mtb0x1 force-pushed the main branch 2 times, most recently from d022c94 to 0665321 Compare July 31, 2024 22:44
@mtb0x1
Copy link
Contributor Author

mtb0x1 commented Jul 31, 2024

Looks like flake8 also found a couple of nits

Yes, sorry about that I don't have a proper python setup locally I have to check ci output everytime.
I will let you know when it's passing.

@sbc100 sbc100 enabled auto-merge (squash) July 31, 2024 22:46
@mtb0x1
Copy link
Contributor Author

mtb0x1 commented Jul 31, 2024

flake8 is fine now, but test-linux is failing again.
I am not sure of it's a timeout or a real issue that I am missing.

logs in https://circleci.com/api/v1.1/project/github/emscripten-core/emsdk/14456/output/106/0?file=true&allocation-id=66aabe4cea13c3196692b681-0-build%2FABCDEFGH, indicate

...
[ 14%] Building CXX object src/wasm/CMakeFiles/wasm.dir/parsing.cpp.o
c++: fatal error: Killed signal terminated program cc1plus
compilation terminated.
make[2]: *** [src/parser/CMakeFiles/parser.dir/build.make:128: src/parser/CMakeFiles/parser.dir/parse-3-implicit-types.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs
...

I am guessing it's a resource issue, the step test_binaryen_from_source is building binaryen from source with all available cores (in this case 35) and somehow this causes a OOM ?

@sbc100 sbc100 disabled auto-merge August 1, 2024 00:41
@sbc100 sbc100 merged commit fad40cf into emscripten-core:main Aug 1, 2024
8 of 9 checks passed
sbc100 added a commit that referenced this pull request Aug 1, 2024
Turns out this is what was causing the OOM when building
binaryen since we were clobbering the EMSDK_NUM_CORES environment
variable by mistake.
@sbc100
Copy link
Collaborator

sbc100 commented Aug 1, 2024

Oops, looks like there was a missing comma: #1433

sbc100 added a commit that referenced this pull request Aug 1, 2024
Turns out this is what was causing the OOM when building binaryen since
we were clobbering the EMSDK_NUM_CORES environment variable by mistake.

See #1429
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants