diff --git a/testing/buildbot/APKBUILD b/testing/buildbot/APKBUILD index 434114dcb23..828eb83c647 100644 --- a/testing/buildbot/APKBUILD +++ b/testing/buildbot/APKBUILD @@ -37,7 +37,10 @@ subpackages=" $pkgname-www $pkgname-pyc " -source="$pkgname-$pkgver.tar.gz::https://github.com/buildbot/buildbot/archive/refs/tags/v$pkgver.tar.gz" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/buildbot/buildbot/archive/refs/tags/v$pkgver.tar.gz + system-rollup.patch + " get_pyver() { python -c "import sys; print('{}.{}'.format(*sys.version_info[:2]))" @@ -149,4 +152,5 @@ www() { sha512sums=" f86f7b1ed0b9abaad8ed6e6bc2e5d42dea43c09efc4bec93aa6a27dde8baff1f68df829a05cf890c82378a9d8bc91d26c7f24180876b15d316b1b80f3bbc0eed buildbot-4.3.0.tar.gz +438b98cf4fd8ade65cebe31b26933c49f5e46dac0eb0977322dda7f6c407d6f7e7a15c6911cf4c96d5b5e812ea807900b1857c4b29fb4016441addde05832adc system-rollup.patch " diff --git a/testing/buildbot/system-rollup.patch b/testing/buildbot/system-rollup.patch new file mode 100644 index 00000000000..20b5c2beb91 --- /dev/null +++ b/testing/buildbot/system-rollup.patch @@ -0,0 +1,29 @@ +--- ./Makefile.orig ++++ ./Makefile +@@ -65,11 +65,11 @@ + frontend_deps: $(VENV_NAME) check_for_yarn + $(PIP) install build wheel -r requirements-ci.txt + for i in $(WWW_DEP_PKGS); \ +- do (cd $$i; $(YARN) install --pure-lockfile; $(YARN) run build); done ++ 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 + + frontend_tests: frontend_deps check_for_yarn + for i in $(WWW_PKGS); \ +- do (cd $$i; $(YARN) install --pure-lockfile); done ++ do (cd $$i; $(YARN) install --frozen-lockfile; rm -r node_modules/rollup; ln -s /usr/share/node_modules/rollup node_modules/rollup); done + for i in $(WWW_PKGS_FOR_UNIT_TESTS); \ + do (cd $$i; $(YARN) run build-dev || exit 1; $(YARN) run test || exit 1) || exit 1; done + +--- ./pkg/buildbot_pkg.py.orig ++++ ./pkg/buildbot_pkg.py +@@ -224,7 +224,9 @@ + assert yarn_program is not None, "need nodejs and yarn installed in current PATH" + + commands = [ +- [yarn_program, 'install', '--pure-lockfile'], ++ [yarn_program, 'install', '--frozen-lockfile', '--ignore-scripts'], ++ ['rm', '-r', 'node_modules/rollup'], ++ ['ln', '-s', '/usr/share/node_modules/rollup', 'node_modules/rollup'], + [yarn_program, 'run', 'build'], + ] +