Skip to content

Conversation

@sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Jul 6, 2020

Remove the optional argument to contruct_env. It simple if we
always construct the env in the same place. Avoid using temp files,
and avoid changing directory.

Remove the optional argument to contruct_env.  It simple if we
always construct the env in the same place.  Avoid using temp files,
and avoid changing directory.
@sbc100 sbc100 requested a review from tlively July 6, 2020 18:55
Copy link
Member

@tlively tlively left a comment

Choose a reason for hiding this comment

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

Looks like some nice simplifications to me. Do we have any testing to guarantee that all the more esoteric shell scripts still work?

@sbc100
Copy link
Collaborator Author

sbc100 commented Jul 6, 2020

No tests for this stuff no :(

Of course it would be nice if we had some... but I'm not signing up to do that today :)

@sbc100 sbc100 merged commit 819e95c into master Jul 6, 2020
@sbc100 sbc100 deleted the emsdk_env branch July 6, 2020 23:34
ilammy added a commit to ilammy/themis that referenced this pull request Jul 7, 2020
The current HEAD of emsdk repository includes a change that causes the
builds to fail with an error:

    Adding directories to PATH:
    PATH += /home/user/emsdk
    PATH += /home/user/emsdk/fastcomp/emscripten
    PATH += /home/user/emsdk/node/12.18.1_64bit/bin

    Setting environment variables:
    EMSDK = /home/user/emsdk
    EM_CONFIG = /home/user/emsdk/.emscripten
    EM_CACHE = /home/user/emsdk/fastcomp/emscripten/cache
    EMSDK_NODE = /home/user/emsdk/node/12.18.1_64bit/bin/node
    /home/user/emsdk/emsdk_env.sh: line 26: /home/user/emsdk/emsdk_set_env.sh: No such file or directory

The change [1] has optimized environment variable setup. Apparently,
it has issues. To avoid breaking our builds, roll back to the previous
known good state for the time being. The issue has been reported to
Emscripten [2], but it's not clear when it's going to be reverted and
fixed, so we'd rather not depend on that right now, when Themis release
is brewing.

[1]: emscripten-core/emsdk#539
[2]: emscripten-core/emsdk#540
ilammy added a commit to cossacklabs/themis that referenced this pull request Jul 7, 2020
The current HEAD of emsdk repository includes a change that causes the
builds to fail with an error:

    Adding directories to PATH:
    PATH += /home/user/emsdk
    PATH += /home/user/emsdk/fastcomp/emscripten
    PATH += /home/user/emsdk/node/12.18.1_64bit/bin

    Setting environment variables:
    EMSDK = /home/user/emsdk
    EM_CONFIG = /home/user/emsdk/.emscripten
    EM_CACHE = /home/user/emsdk/fastcomp/emscripten/cache
    EMSDK_NODE = /home/user/emsdk/node/12.18.1_64bit/bin/node
    /home/user/emsdk/emsdk_env.sh: line 26: /home/user/emsdk/emsdk_set_env.sh: No such file or directory

The change [1] has optimized environment variable setup. Apparently,
it has issues. To avoid breaking our builds, roll back to the previous
known good state for the time being. The issue has been reported to
Emscripten [2], but it's not clear when it's going to be reverted and
fixed, so we'd rather not depend on that right now, when Themis release
is brewing.

[1]: emscripten-core/emsdk#539
[2]: emscripten-core/emsdk#540
@roddyaj
Copy link

roddyaj commented Jul 7, 2020

Today when I started my environment, I got this error when sourcing emsdk/emsdk_env.sh: emsdk/emsdk_set_env.sh: No such file or directory Maybe a missed file in the commit? Anyway I went back a commit to fix it.

@zeux
Copy link

zeux commented Jul 7, 2020

I have the same problem; this happens when emsdk_env.sh is sourced from a folder that's not emsdk (e.g. source ../emsdk/emsdk_env.sh) because emsdk_set_env.sh is written to the current folder instead of the folder that emsdk is in.

@kripken
Copy link
Member

kripken commented Jul 7, 2020

Sorry about this, I think it's fixed by #541 which I am landing right now.

@vargaz
Copy link
Contributor

vargaz commented Jul 9, 2020

The optional argument was added to fix this:
emscripten-core/emscripten#9090
So reverting those changes reintroduced the problem.

@sbc100
Copy link
Collaborator Author

sbc100 commented Jul 9, 2020

Oops, sorry about that. I'll take a look.

@sbc100
Copy link
Collaborator Author

sbc100 commented Jul 9, 2020

At I see the problem. I will see if we can swich to using stdout instead (a la ssh-agent).

sbc100 added a commit that referenced this pull request Jul 9, 2020
This is an alternative fix for
emscripten-core/emscripten#9090 which recently
came up again after #539.

Tested with bash, tcsh and fish.
sbc100 added a commit that referenced this pull request Jul 9, 2020
This is an alternative fix for
emscripten-core/emscripten#9090 which recently
came up again after #539.

Tested with bash, tcsh and fish.
sbc100 added a commit that referenced this pull request Jul 11, 2020
This is an alternative fix for
emscripten-core/emscripten#9090 which recently
came up again after #539.

Tested with bash, tcsh and fish.
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.

7 participants