mirror of https://github.com/zulip/zulip.git
Revert "node_cache: Work around pnpm install issue in Docker for Mac."
This reverts commit 126f3b5f47
.
Testing showed that it was ineffective for many users.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
parent
9e0be51a56
commit
99ab700c1b
|
@ -1,6 +1,6 @@
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from scripts.lib.zulip_tools import get_deploy_root, run
|
from scripts.lib.zulip_tools import run
|
||||||
|
|
||||||
DEFAULT_PRODUCTION = False
|
DEFAULT_PRODUCTION = False
|
||||||
|
|
||||||
|
@ -16,16 +16,11 @@ def setup_node_modules(production: bool = DEFAULT_PRODUCTION) -> None:
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
pnpm_command = ["/usr/local/bin/pnpm", "install", "--frozen-lockfile"]
|
run(
|
||||||
if production:
|
[
|
||||||
pnpm_command += ["--prod"]
|
"/usr/local/bin/pnpm",
|
||||||
|
"install",
|
||||||
deploy_root = get_deploy_root()
|
"--frozen-lockfile",
|
||||||
with open("/proc/self/mounts") as mounts:
|
*(["--prod"] if production else []),
|
||||||
for line in mounts:
|
]
|
||||||
fields = line.split()
|
)
|
||||||
if fields[1] == deploy_root and fields[2] in ("fuse.grpcfuse", "fakeowner"):
|
|
||||||
print("Working around https://github.com/pnpm/pnpm/issues/5803")
|
|
||||||
pnpm_command += ["--package-import-method=copy"]
|
|
||||||
|
|
||||||
run(pnpm_command)
|
|
||||||
|
|
Loading…
Reference in New Issue