diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index a2f71946e8..02f6dc03f0 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -87,14 +87,14 @@ jobs: vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }} runId: ${{ inputs.runId || github.event.workflow_run.id }} - # LWC_E2E_tests: - # if: ${{ inputs.lwcE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }} - # uses: ./.github/workflows/lwcE2E.yml - # secrets: inherit - # with: - # automationBranch: ${{ inputs.automationBranch || 'testesm' }} - # vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }} - # runId: ${{ inputs.runId || github.event.workflow_run.id }} + LWC_E2E_tests: + if: ${{ inputs.lwcE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }} + uses: ./.github/workflows/lwcE2E.yml + secrets: inherit + with: + automationBranch: ${{ inputs.automationBranch || 'testesm' }} + vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }} + runId: ${{ inputs.runId || github.event.workflow_run.id }} Apex_E2E_tests_min_vscode_version: if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }} @@ -131,3 +131,12 @@ jobs: automationBranch: 'testesm' vscodeVersion: '1.86.0' runId: ${{ github.event.workflow_run.id }} + + LWC_E2E_tests_min_vscode_version: + if: ${{ inputs.lwcE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }} + uses: ./.github/workflows/lwcE2E.yml + secrets: inherit + with: + automationBranch: 'testesm' + vscodeVersion: '1.86.0' + runId: ${{ github.event.workflow_run.id }} diff --git a/.github/workflows/runE2ETest.yml b/.github/workflows/runE2ETest.yml index 431b35d0c0..358d68c3fc 100644 --- a/.github/workflows/runE2ETest.yml +++ b/.github/workflows/runE2ETest.yml @@ -35,8 +35,6 @@ jobs: os: ${{ fromJson(inputs.os) }} nodeVersion: - 18.18.2 - # We are using VSCode version 1.85.2 instead of the latest version because of a WDIO bug. Starting from Chromedriver v115, the JSON endpoint was moved to a new URL, but WDIO is still trying to find the endpoint only at the old URL. VSCode 1.85.2 is the last supported version of VSCode because it uses Chromedriver v114, which is the last Chromedriver version that can be found using the old URL. VSCode 1.86.0 uses Chromedriver v118, which has an endpoint that can be found only at the new URL. - # We are using VSCode 1.85.2 for our E2E tests as a workaround until WDIO fixes this bug: https://github.com/webdriverio-community/wdio-vscode-service/pull/94 vscodeVersion: - ${{ inputs.vscodeVersion }} steps: