This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new f20db691c7 NIFI-13385: (#8953)
f20db691c7 is described below
commit f20db691c7314b74ce47594e55b585dac21487d8
Author: Matt Gilman <[email protected]>
AuthorDate: Tue Jun 11 13:02:28 2024 -0400
NIFI-13385: (#8953)
- Disabling nx daemon during builds.
This closes #8953
---
nifi-frontend/pom.xml | 7 +++---
nifi-frontend/src/main/frontend/.build.env | 2 ++
nifi-frontend/src/main/frontend/package-lock.json | 26 +++++++++++++++++++++++
nifi-frontend/src/main/frontend/package.json | 1 +
4 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/nifi-frontend/pom.xml b/nifi-frontend/pom.xml
index 93cf26a648..3cad47aa22 100644
--- a/nifi-frontend/pom.xml
+++ b/nifi-frontend/pom.xml
@@ -191,7 +191,7 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <arguments>nx run-many -t lint</arguments>
+ <arguments>env-cmd -f .build.env nx run-many -t
lint</arguments>
<workingDirectory>${frontend.working.dir}</workingDirectory>
<skip>${frontend.skipTests}</skip>
</configuration>
@@ -206,7 +206,7 @@
</goals>
<phase>test</phase>
<configuration>
- <arguments>nx run-many -t test
--maxWorkers=2</arguments>
+ <arguments>env-cmd -f .build.env nx run-many -t
test --maxWorkers=2</arguments>
<workingDirectory>${frontend.working.dir}</workingDirectory>
<skip>${frontend.skipTests}</skip>
</configuration>
@@ -221,7 +221,7 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <arguments>nx run-many -t build</arguments>
+ <arguments>env-cmd -f .build.env nx run-many -t
build</arguments>
<workingDirectory>${frontend.working.dir}</workingDirectory>
</configuration>
</execution>
@@ -236,6 +236,7 @@
<exclude>src/main/frontend/node_modules/**/*</exclude>
<exclude>src/main/frontend/apps/nifi/src/assets/fonts/**/*</exclude>
<exclude>src/main/frontend/.editorconfig</exclude>
+ <exclude>src/main/frontend/.build.env</exclude>
<exclude>src/main/frontend/README.md</exclude>
<exclude>src/main/frontend/apps/nifi/proxy.config.mjs</exclude>
<exclude>src/main/frontend/.prettierrc</exclude>
diff --git a/nifi-frontend/src/main/frontend/.build.env
b/nifi-frontend/src/main/frontend/.build.env
new file mode 100644
index 0000000000..bdf5b36ef0
--- /dev/null
+++ b/nifi-frontend/src/main/frontend/.build.env
@@ -0,0 +1,2 @@
+# disable nx daemon in builds
+NX_DAEMON=false
diff --git a/nifi-frontend/src/main/frontend/package-lock.json
b/nifi-frontend/src/main/frontend/package-lock.json
index d7fb60d41d..cdfdb9a8a3 100644
--- a/nifi-frontend/src/main/frontend/package-lock.json
+++ b/nifi-frontend/src/main/frontend/package-lock.json
@@ -62,6 +62,7 @@
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"autoprefixer": "^10.4.16",
+ "env-cmd": "^10.1.0",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.0.1",
@@ -14778,6 +14779,31 @@
"url": "https://github.com/fb55/entities?sponsor=1";
}
},
+ "node_modules/env-cmd": {
+ "version": "10.1.0",
+ "resolved":
"https://registry.npmjs.org/env-cmd/-/env-cmd-10.1.0.tgz";,
+ "integrity":
"sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA==",
+ "dev": true,
+ "dependencies": {
+ "commander": "^4.0.0",
+ "cross-spawn": "^7.0.0"
+ },
+ "bin": {
+ "env-cmd": "bin/env-cmd.js"
+ },
+ "engines": {
+ "node": ">=8.0.0"
+ }
+ },
+ "node_modules/env-cmd/node_modules/commander": {
+ "version": "4.1.1",
+ "resolved":
"https://registry.npmjs.org/commander/-/commander-4.1.1.tgz";,
+ "integrity":
"sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/env-paths": {
"version": "2.2.1",
"resolved":
"https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz";,
diff --git a/nifi-frontend/src/main/frontend/package.json
b/nifi-frontend/src/main/frontend/package.json
index b1f01850ad..f2b0e2069c 100644
--- a/nifi-frontend/src/main/frontend/package.json
+++ b/nifi-frontend/src/main/frontend/package.json
@@ -68,6 +68,7 @@
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"autoprefixer": "^10.4.16",
+ "env-cmd": "^10.1.0",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.0.1",
