From cc37f6f021cb2652b6a8b4a62aecc47ed8e29423 Mon Sep 17 00:00:00 2001 From: Senthanal Sirpi Manohar Date: Sat, 28 Jun 2025 14:39:06 +0200 Subject: [PATCH 1/2] PFM-ISSUE-30550 avoid passing non cypress cli parameter into e2e target --- .github/workflows/fe-e2e.yml | 2 +- tools/scripts/run-many/run-many.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fe-e2e.yml b/.github/workflows/fe-e2e.yml index 6f713ecf..a78799dc 100644 --- a/.github/workflows/fe-e2e.yml +++ b/.github/workflows/fe-e2e.yml @@ -45,7 +45,7 @@ jobs: - name: Affected Regression Tests id: regressionTests continue-on-error: true - uses: collaborationFactory/github-actions/.github/actions/run-many@release/25.3 + uses: collaborationFactory/github-actions/.github/actions/run-many@fix/PFM-ISSUE-30550-Cypress-E2E-Tests-Fail-Due-to-Invalid-base with: target: ${{ matrix.target }} jobIndex: ${{ matrix.jobIndex }} diff --git a/tools/scripts/run-many/run-many.ts b/tools/scripts/run-many/run-many.ts index 08524a5f..7339e58d 100644 --- a/tools/scripts/run-many/run-many.ts +++ b/tools/scripts/run-many/run-many.ts @@ -8,6 +8,11 @@ function getE2ECommand(command: string, base: string): string { } function runCommand(command: string): void { + if (command.includes('--targets=e2e')) { + const commandArr = command.split(' '); + console.log(commandArr); + command = commandArr.filter(c => !c.includes('--base=')).join(' '); + } core.info(`Running > ${command}`); try { From 7f9bae109e05ba2e83cdb98f16cddf57e2fee9b1 Mon Sep 17 00:00:00 2001 From: Senthanal Sirpi Manohar Date: Sat, 28 Jun 2025 17:17:58 +0200 Subject: [PATCH 2/2] PFM-ISSUE-30550 update action reference to use release/25.3 for regression tests --- .github/workflows/fe-e2e.yml | 2 +- tools/scripts/run-many/run-many.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/fe-e2e.yml b/.github/workflows/fe-e2e.yml index a78799dc..6f713ecf 100644 --- a/.github/workflows/fe-e2e.yml +++ b/.github/workflows/fe-e2e.yml @@ -45,7 +45,7 @@ jobs: - name: Affected Regression Tests id: regressionTests continue-on-error: true - uses: collaborationFactory/github-actions/.github/actions/run-many@fix/PFM-ISSUE-30550-Cypress-E2E-Tests-Fail-Due-to-Invalid-base + uses: collaborationFactory/github-actions/.github/actions/run-many@release/25.3 with: target: ${{ matrix.target }} jobIndex: ${{ matrix.jobIndex }} diff --git a/tools/scripts/run-many/run-many.ts b/tools/scripts/run-many/run-many.ts index 7339e58d..6edba960 100644 --- a/tools/scripts/run-many/run-many.ts +++ b/tools/scripts/run-many/run-many.ts @@ -10,7 +10,6 @@ function getE2ECommand(command: string, base: string): string { function runCommand(command: string): void { if (command.includes('--targets=e2e')) { const commandArr = command.split(' '); - console.log(commandArr); command = commandArr.filter(c => !c.includes('--base=')).join(' '); } core.info(`Running > ${command}`);