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:
Anders Kaseorg 2023-03-30 15:31:05 -07:00 committed by Tim Abbott
parent 9e0be51a56
commit 99ab700c1b
1 changed files with 9 additions and 14 deletions

View File

@ -1,6 +1,6 @@
import os
from scripts.lib.zulip_tools import get_deploy_root, run
from scripts.lib.zulip_tools import run
DEFAULT_PRODUCTION = False
@ -16,16 +16,11 @@ def setup_node_modules(production: bool = DEFAULT_PRODUCTION) -> None:
except FileNotFoundError:
pass
pnpm_command = ["/usr/local/bin/pnpm", "install", "--frozen-lockfile"]
if production:
pnpm_command += ["--prod"]
deploy_root = get_deploy_root()
with open("/proc/self/mounts") as mounts:
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)
run(
[
"/usr/local/bin/pnpm",
"install",
"--frozen-lockfile",
*(["--prod"] if production else []),
]
)