PR#50420: Issue 50052 - Fix rpm.mk according to audit-ci change - 389-ds-base

389-ds-base

#50420 Issue 50052 - Fix rpm.mk according to audit-ci change

Closed 3 years ago by spichugi. Opened 4 years ago by spichugi.

spichugi/389-ds-base fix-audit-ci into master

Issue 50052 - Fix rpm.mk according to audit-ci change

Simon Pichugin • 4 years ago

ff46f53

rpm.mk

file modified

+4 -4

		`@@ -33,13 +33,13 @@`
		`rm -rf dist`
		`rm -rf rpmbuild`

		`- $(NODE_MODULES_TEST):`
		`+ install-node-modules:`
		`cd src/cockpit/389-console; make -f node_modules.mk install`

		`- build-cockpit: $(NODE_MODULES_TEST)`
		`+ build-cockpit: install-node-modules`
		`cd src/cockpit/389-console; make -f node_modules.mk build-cockpit-plugin`

		`- dist-bz2: $(NODE_MODULES_TEST)`
		`+ dist-bz2: install-node-modules`
		`cd src/cockpit/389-console; \`
		`rm -rf cockpit_dist; \`
		`make -f node_modules.mk build-cockpit-plugin; \`
		`@@ -54,7 +54,7 @@`

		`local-archive: build-cockpit`
		`-mkdir -p dist/$(NAME_VERSION)`
		`- rsync -a --exclude=node_modules --exclude=dist --exclude=.git --exclude=rpmbuild . dist/$(NAME_VERSION)`
		`+ rsync -a --exclude=node_modules --exclude=dist --exclude=__pycache__ --exclude=.git --exclude=rpmbuild . dist/$(NAME_VERSION)`

		`tarballs: local-archive`
		`-mkdir -p dist/sources`

src/cockpit/389-console/node_modules.mk

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`install: package.json`
		`- test -f node_modules/webpack \|\| npm ci`
		`+ npm ci`

		`build-cockpit-plugin: webpack.config.js`
		`npm run audit-ci && npm run build && cp -r dist cockpit_dist`

spichugi commented 4 years ago

Description: Always run npm ci when we run node_modules install.
It should be done because we always have to be sure about
what we ship in the package is safe and stable.

https://pagure.io/389-ds-base/issue/50052

Reviewed by: ?

rebased onto 5e7f8e47ac6606d1a9c49f160f73dc4464aeb777

4 years ago