| 1 | |
| 2 | |
| 3 | @@ -65,11 +65,11 @@
|
| 4 | frontend_deps: $(VENV_NAME) check_for_yarn
|
| 5 | $(PIP) install build wheel -r requirements-ci.txt
|
| 6 | for i in $(WWW_DEP_PKGS); \
|
| 7 | - do (cd $$i; $(YARN) install --pure-lockfile; $(YARN) run build); done
|
| 8 | + do (cd $$i; $(YARN) install --frozen-lockfile --ignore-scripts; rm -r node_modules/rollup; ln -s /usr/share/node_modules/rollup node_modules/rollup; $(YARN) run build); done
|
| 9 |
|
| 10 | frontend_tests: frontend_deps check_for_yarn
|
| 11 | for i in $(WWW_PKGS); \
|
| 12 | - do (cd $$i; $(YARN) install --pure-lockfile); done
|
| 13 | + do (cd $$i; $(YARN) install --frozen-lockfile; rm -r node_modules/rollup; ln -s /usr/share/node_modules/rollup node_modules/rollup); done
|
| 14 | for i in $(WWW_PKGS_FOR_UNIT_TESTS); \
|
| 15 | do (cd $$i; $(YARN) run build-dev || exit 1; $(YARN) run test || exit 1) || exit 1; done
|
| 16 |
|
| 17 | |
| 18 | |
| 19 | @@ -224,7 +224,9 @@
|
| 20 | assert yarn_program is not None, "need nodejs and yarn installed in current PATH"
|
| 21 |
|
| 22 | commands = [
|
| 23 | - [yarn_program, 'install', '--pure-lockfile'],
|
| 24 | + [yarn_program, 'install', '--frozen-lockfile', '--ignore-scripts'],
|
| 25 | + ['rm', '-r', 'node_modules/rollup'],
|
| 26 | + ['ln', '-s', '/usr/share/node_modules/rollup', 'node_modules/rollup'],
|
| 27 | [yarn_program, 'run', 'build'],
|
| 28 | ]
|
| 29 |
|