From 0bf0c944aa69cc5ae7da68cafba890dd96bae652 Mon Sep 17 00:00:00 2001 From: Kristofer Date: Thu, 28 Nov 2024 14:12:31 +0000 Subject: [PATCH 1/5] Add docker-stupp and CI namedInputs by default --- nx.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 2c273e35a623..9d338016173e 100644 --- a/nx.json +++ b/nx.json @@ -146,12 +146,20 @@ } }, "namedInputs": { - "default": ["{projectRoot}/**/*", "sharedGlobals"], + "default": ["{projectRoot}/**/*", "sharedGlobals", "docker-stuff", "CI"], "nodeVersion": [ { "runtime": "node --version" } ], + "CI": [ + "{workspaceRoot}/.github/actions/", + "{workspaceRoot}/.github/workflows/" + ], + "docker-stuff": [ + "{workspaceRoot}/**/Dockerfile", + "{workspaceRoot}/**/Dockerfile.*" + ], "sharedGlobals": [ "{workspaceRoot}/eslint-local-rules.js", "{workspaceRoot}/nx.json", From 4f897cd7358ae206c60665d4bb20ffce7dac71b1 Mon Sep 17 00:00:00 2001 From: Kristofer Date: Thu, 28 Nov 2024 14:25:24 +0000 Subject: [PATCH 2/5] Use single "DevOps" input --- nx.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nx.json b/nx.json index 9d338016173e..f023539f181e 100644 --- a/nx.json +++ b/nx.json @@ -95,7 +95,7 @@ "targetDefaults": { "build": { "dependsOn": ["^build"], - "inputs": ["production", "^production"] + "inputs": ["production", "^production", "DevOps"] }, "e2e": { "inputs": ["default", "^production"] @@ -146,17 +146,18 @@ } }, "namedInputs": { - "default": ["{projectRoot}/**/*", "sharedGlobals", "docker-stuff", "CI"], + "default": ["{projectRoot}/**/*", "sharedGlobals", "DevOps"], "nodeVersion": [ { "runtime": "node --version" } ], + "DevOps": ["CI", "Dockerfiles"], "CI": [ "{workspaceRoot}/.github/actions/", "{workspaceRoot}/.github/workflows/" ], - "docker-stuff": [ + "Dockerfiles": [ "{workspaceRoot}/**/Dockerfile", "{workspaceRoot}/**/Dockerfile.*" ], From d7aa5ff160666615f1c23f09476028e862d76ab4 Mon Sep 17 00:00:00 2001 From: Kristofer Date: Thu, 28 Nov 2024 14:32:40 +0000 Subject: [PATCH 3/5] Add more stuff to Dockerfiles input --- nx.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nx.json b/nx.json index f023539f181e..315c6e102918 100644 --- a/nx.json +++ b/nx.json @@ -146,7 +146,7 @@ } }, "namedInputs": { - "default": ["{projectRoot}/**/*", "sharedGlobals", "DevOps"], + "default": ["{projectRoot}/**/*", "sharedGlobals"], "nodeVersion": [ { "runtime": "node --version" @@ -154,8 +154,10 @@ ], "DevOps": ["CI", "Dockerfiles"], "CI": [ + "{workspaceRoot}/**/docker-compose*.yml", "{workspaceRoot}/.github/actions/", - "{workspaceRoot}/.github/workflows/" + "{workspaceRoot}/.github/workflows/", + "{workspaceRoot}/**/.dockerignore" ], "Dockerfiles": [ "{workspaceRoot}/**/Dockerfile", From 06725094b337f07def269af0eda08ec6ae04acf4 Mon Sep 17 00:00:00 2001 From: Kristofer Date: Fri, 29 Nov 2024 12:12:17 +0000 Subject: [PATCH 4/5] Add scripts/ as affecter --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 315c6e102918..fee7165ac4a1 100644 --- a/nx.json +++ b/nx.json @@ -152,7 +152,7 @@ "runtime": "node --version" } ], - "DevOps": ["CI", "Dockerfiles"], + "DevOps": ["CI", "Dockerfiles", "{workspaceRoot}/scripts/**/*"], "CI": [ "{workspaceRoot}/**/docker-compose*.yml", "{workspaceRoot}/.github/actions/", From 7dc9212a847726432ff111cbfcd91e8f0ed199ca Mon Sep 17 00:00:00 2001 From: Kristofer Date: Fri, 29 Nov 2024 12:12:32 +0000 Subject: [PATCH 5/5] Remove docker-compose from affections --- nx.json | 1 - 1 file changed, 1 deletion(-) diff --git a/nx.json b/nx.json index fee7165ac4a1..09dc5f85ab62 100644 --- a/nx.json +++ b/nx.json @@ -154,7 +154,6 @@ ], "DevOps": ["CI", "Dockerfiles", "{workspaceRoot}/scripts/**/*"], "CI": [ - "{workspaceRoot}/**/docker-compose*.yml", "{workspaceRoot}/.github/actions/", "{workspaceRoot}/.github/workflows/", "{workspaceRoot}/**/.dockerignore"