NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit1a42175

authored

fix: Check yarn files during install (frappe#1533)

We observed that in some cases files are missing when yarn reuses themfrom cache. Not sure what's causing it but checking files seems to atleast fix it. This is probably some yarn bug.

1 parentf5ab045 commit1a42175Copy full SHA for 1a42175

File tree

2 files changed

+21

-8

lines changed

bench
- app.py
- utils
  - bench.py

2 files changed

+21

-8

lines changed

`‎bench/app.py`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ def prune_app_directory(self):`
`423`	`423`	`remove_unused_node_modules(app_path)`
`424`	`424`
`425`	`425`
`426`		`-defcoerce_url_to_name_if_possible(git_url:str,cache_key:str)->str:`
	`426`	`+defcoerce_url_to_name_if_possible(git_url:str,cache_key:str)->str:`
`427`	`427`	`app_name=os.path.basename(git_url)`
`428`	`428`	`ifcan_get_cached(app_name,cache_key):`
`429`	`429`	`returnapp_name`
`@@ -435,7 +435,7 @@ def can_get_cached(app_name: str, cache_key: str) -> bool:`
`435`	`435`	Used before App is initialized if passed `git_url` is a
`436`	`436`	`file URL as opposed to the app name.`
`437`	`437`
`438`		-If True then `git_url` can be coerced into the `app_name` and
	`438`	+If True then `git_url` can be coerced into the `app_name` and
`439`	`439`	`checking local remote and fetching can be skipped while keeping`
`440`	`440`	`get-app command params the same.`
`441`	`441`	`"""`
`@@ -671,7 +671,7 @@ def get_app(`
`671`	`671`	`importbench.cliasbench_cli`
`672`	`672`	`frombench.benchimportBench`
`673`	`673`	`frombench.utils.appimportcheck_existing_dir`
`674`		`-`
	`674`	`+`
`675`	`675`	`ifurlparse(git_url).scheme=="file"andcache_key:`
`676`	`676`	`git_url=coerce_url_to_name_if_possible(git_url,cache_key)`
`677`	`677`
`@@ -908,7 +908,9 @@ def install_app(`
`908`	`908`	`install_python_dev_dependencies(apps=app,bench_path=bench_path,verbose=verbose)`
`909`	`909`
`910`	`910`	`ifnotusing_cachedandos.path.exists(os.path.join(app_path,"package.json")):`
`911`		`-yarn_install="yarn install --verbose"ifverboseelse"yarn install"`
	`911`	`+yarn_install="yarn install --check-files"`
	`912`	`+ifverbose:`
	`913`	`+yarn_install+=" --verbose"`
`912`	`914`	`bench.run(yarn_install,cwd=app_path)`
`913`	`915`
`914`	`916`	`bench.apps.sync(app_name=app,required=resolution,branch=tag,app_dir=app_path)`

`‎bench/utils/bench.py`

Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,14 @@`
`18`	`18`	`# imports - module imports`
`19`	`19`	`importbench`
`20`	`20`	`frombench.exceptionsimportPatchError,ValidationError`
`21`		`-frombench.utilsimport (exec_cmd,get_bench_cache_path,get_bench_name,`
`22`		`-get_cmd_output,log,which)`
	`21`	`+frombench.utilsimport (`
	`22`	`+exec_cmd,`
	`23`	`+get_bench_cache_path,`
	`24`	`+get_bench_name,`
	`25`	`+get_cmd_output,`
	`26`	`+log,`
	`27`	`+which,`
	`28`	`+)`
`23`	`29`
`24`	`30`	`logger=logging.getLogger(bench.PROJECT_NAME)`
`25`	`31`
`@@ -132,7 +138,9 @@ def update_yarn_packages(bench_path=".", apps=None, verbose=None):`
`132`	`138`	`app_path=os.path.join(apps_dir,app)`
`133`	`139`	`ifos.path.exists(os.path.join(app_path,"package.json")):`
`134`	`140`	`click.secho(f"\nInstalling node dependencies for{app}",fg="yellow")`
`135`		`-yarn_install="yarn install --verbose"ifverboseelse"yarn install"`
	`141`	`+yarn_install="yarn install --check-files"`
	`142`	`+ifverbose:`
	`143`	`+yarn_install+=" --verbose"`
`136`	`144`	`bench.run(yarn_install,cwd=app_path)`
`137`	`145`
`138`	`146`
`@@ -329,7 +337,10 @@ def restart_supervisor_processes(bench_path=".", web_workers=False, _raise=False`
`329`	`337`	`forgroupingroups:`
`330`	`338`	`failure=bench.run(f"{sudo}supervisorctl restart{group}",_raise=_raise)`
`331`	`339`	`iffailure:`
`332`		-log(f"restarting supervisor group `{group}` failed. Use `bench restart` to retry.",level=3)
	`340`	`+log(`
	`341`	+f"restarting supervisor group `{group}` failed. Use `bench restart` to retry.",
	`342`	`+level=3,`
	`343`	`+)`
`333`	`344`
`334`	`345`
`335`	`346`	`defrestart_systemd_processes(bench_path=".",web_workers=False,_raise=True):`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1a42175

File tree

2 files changed

2 files changed

`‎bench/app.py`

`‎bench/utils/bench.py`

0 commit comments