From 408b08a123c51482480205460b0e13387687ddc9 Mon Sep 17 00:00:00 2001 From: alekhya-cplace Date: Fri, 31 Jan 2025 17:29:04 +0100 Subject: [PATCH 1/5] PFM-ISSUE-29136:excluding cypress caching --- .github/workflows/fe-e2e.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/fe-e2e.yml b/.github/workflows/fe-e2e.yml index 3106af15..58117136 100644 --- a/.github/workflows/fe-e2e.yml +++ b/.github/workflows/fe-e2e.yml @@ -38,6 +38,9 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-modules- + exclude: '/home/runner/.cache/Cypress' # Exclude Cypress cache - name: Install Cypress Binary run: npx cypress install From af2db3f9cd22f78e0506c8664ae9637ddf43310a Mon Sep 17 00:00:00 2001 From: alekhya-cplace Date: Fri, 31 Jan 2025 17:29:04 +0100 Subject: [PATCH 2/5] PFM-ISSUE-29136:excluding cypress caching --- .github/workflows/fe-e2e.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/fe-e2e.yml b/.github/workflows/fe-e2e.yml index 0a8e2d7f..6823662f 100644 --- a/.github/workflows/fe-e2e.yml +++ b/.github/workflows/fe-e2e.yml @@ -38,6 +38,9 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-modules- + exclude: '/home/runner/.cache/Cypress' # Exclude Cypress cache - name: Install Cypress Binary run: npx cypress install From d8056bb45b5da93c558c2263e88b797136804c35 Mon Sep 17 00:00:00 2001 From: alekhya-cplace Date: Wed, 19 Feb 2025 17:19:22 +0100 Subject: [PATCH 3/5] excluding cypress through path --- .github/workflows/fe-e2e.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fe-e2e.yml b/.github/workflows/fe-e2e.yml index 6823662f..4d3ab1cf 100644 --- a/.github/workflows/fe-e2e.yml +++ b/.github/workflows/fe-e2e.yml @@ -36,11 +36,12 @@ jobs: id: npm-cache uses: actions/cache@v4 with: - path: '**/node_modules' + path: | + **/node_modules + !/home/runner/.cache/Cypress key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-modules- - exclude: '/home/runner/.cache/Cypress' # Exclude Cypress cache - name: Install Cypress Binary run: npx cypress install From c42193b02f01e0e05578bb71f9ae4949a1a0cb8c Mon Sep 17 00:00:00 2001 From: Senthanal Sirpi Manohar Date: Sun, 2 Mar 2025 17:09:14 +0100 Subject: [PATCH 4/5] PFM-ISSUE-29136 npx instead of nx bin --- tools/scripts/run-many/run-many.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scripts/run-many/run-many.ts b/tools/scripts/run-many/run-many.ts index 95eeeb73..3df51e7f 100644 --- a/tools/scripts/run-many/run-many.ts +++ b/tools/scripts/run-many/run-many.ts @@ -45,7 +45,7 @@ function main() { const projects = getAffectedProjects(target, jobIndex, jobCount, base, ref); - const runManyProjectsCmd = `./node_modules/.bin/nx run-many --targets=${target} --projects=${projects}`; + const runManyProjectsCmd = `npx nx run-many --targets=${target} --projects=${projects}`; let cmd = `${runManyProjectsCmd} --parallel=false --prod`; if (target.includes('e2e')) { From fd3c39d9f468b032b40a64341274a5c307e1a8b6 Mon Sep 17 00:00:00 2001 From: Senthanal Sirpi Manohar Date: Sun, 2 Mar 2025 17:20:07 +0100 Subject: [PATCH 5/5] PFM-ISSUE-29136 npx instead of nx bin --- tools/scripts/artifacts/nx-project.ts | 2 +- tools/scripts/artifacts/utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scripts/artifacts/nx-project.ts b/tools/scripts/artifacts/nx-project.ts index e4d641bb..1ae60cc7 100644 --- a/tools/scripts/artifacts/nx-project.ts +++ b/tools/scripts/artifacts/nx-project.ts @@ -123,7 +123,7 @@ export class NxProject { public build() { console.log( execSync( - `./node_modules/.bin/nx build ${this.name} --prod ${ + `npx nx build ${this.name} --prod ${ this.nxProjectKind === NxProjectKind.Application && this.task !== TASK.RELEASE ? '--sourceMap=true' diff --git a/tools/scripts/artifacts/utils.ts b/tools/scripts/artifacts/utils.ts index 937f4a79..65ec5809 100644 --- a/tools/scripts/artifacts/utils.ts +++ b/tools/scripts/artifacts/utils.ts @@ -116,7 +116,7 @@ export class Utils { base?: string, target?: string ): string[] { - let cmd = `./node_modules/.bin/nx show projects --affected=${affected} `; + let cmd = `npx nx show projects --affected=${affected} `; if (base) { cmd = cmd.concat(`--base=${base} `); }