From 82a1c25ff8dcfac63dec1ca6322bf00123056609 Mon Sep 17 00:00:00 2001 From: Kevin He Date: Tue, 14 Oct 2025 11:53:02 -0700 Subject: [PATCH 1/3] remove node 18 from e2e matrix --- .github/workflows/e2e.yml | 40 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 13da93b2c5..8ab0d22710 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -11,18 +11,14 @@ jobs: fail-fast: false matrix: # Run all matrix env at once because we will not deploy demo app to MRT. - node: [18, 20, 22] - npm: [8, 9, 10, 11] - exclude: # node 18 with npm 11 is not compatible - - node: 18 - npm: 11 + node: [20, 22] + npm: [10, 11] runs-on: ubuntu-latest env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ # (We also use this env var for making sure a step runs once for the current node version) - # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10 - IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }} + IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }} steps: - name: Checkout uses: actions/checkout@v4 @@ -67,18 +63,14 @@ jobs: max-parallel: 1 matrix: # Run all matrix env at once because we will not deploy demo app to MRT. - node: [18, 20, 22] - npm: [8, 9, 10, 11] - exclude: # node 18 with npm 11 is not compatible - - node: 18 - npm: 11 + node: [20, 22] + npm: [10, 11] runs-on: ubuntu-latest env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ # (We also use this env var for making sure a step runs once for the current node version) - # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10 - IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }} + IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }} steps: - name: Checkout @@ -183,18 +175,14 @@ jobs: max-parallel: 1 matrix: # Run all matrix env at once because we will not deploy demo app to MRT. - node: [18, 20, 22] - npm: [8, 9, 10, 11] - exclude: # node 18 with npm 11 is not compatible - - node: 18 - npm: 11 + node: [20, 22] + npm: [10, 11] runs-on: ubuntu-latest env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ # (We also use this env var for making sure a step runs once for the current node version) - # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10 - IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }} + IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }} # The current recommended version for Managed Runtime: # https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html IS_MRT_NODE: ${{ matrix.node == 22 && matrix.npm == 11 }} @@ -303,18 +291,14 @@ jobs: max-parallel: 1 matrix: # Run all matrix env at once because we will not deploy demo app to MRT. - node: [18, 20, 22] - npm: [8, 9, 10, 11] - exclude: # node 18 with npm 11 is not compatible - - node: 18 - npm: 11 + node: [20, 22] + npm: [10, 11] runs-on: ubuntu-latest env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ # (We also use this env var for making sure a step runs once for the current node version) - # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10 - IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }} + IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }} steps: - name: Checkout uses: actions/checkout@v4 From 0c9accf9112a9c3c7f7310b9c8b4dd975a64186b Mon Sep 17 00:00:00 2001 From: Kevin He Date: Tue, 14 Oct 2025 11:57:21 -0700 Subject: [PATCH 2/3] use larger runner for e2e tests --- .github/workflows/e2e.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 8ab0d22710..423db2503f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -65,7 +65,7 @@ jobs: # Run all matrix env at once because we will not deploy demo app to MRT. node: [20, 22] npm: [10, 11] - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ @@ -177,7 +177,7 @@ jobs: # Run all matrix env at once because we will not deploy demo app to MRT. node: [20, 22] npm: [10, 11] - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ @@ -293,7 +293,7 @@ jobs: # Run all matrix env at once because we will not deploy demo app to MRT. node: [20, 22] npm: [10, 11] - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ @@ -400,7 +400,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} test-extra-features: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores steps: - name: Checkout uses: actions/checkout@v4 From b211df3762ad209277c66688d80240e42403c7f5 Mon Sep 17 00:00:00 2001 From: Kevin He Date: Tue, 14 Oct 2025 12:26:38 -0700 Subject: [PATCH 3/3] undo large ubuntu runner --- .github/workflows/e2e.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 423db2503f..8ab0d22710 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -65,7 +65,7 @@ jobs: # Run all matrix env at once because we will not deploy demo app to MRT. node: [20, 22] npm: [10, 11] - runs-on: ubuntu-latest-16-cores + runs-on: ubuntu-latest env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ @@ -177,7 +177,7 @@ jobs: # Run all matrix env at once because we will not deploy demo app to MRT. node: [20, 22] npm: [10, 11] - runs-on: ubuntu-latest-16-cores + runs-on: ubuntu-latest env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ @@ -293,7 +293,7 @@ jobs: # Run all matrix env at once because we will not deploy demo app to MRT. node: [20, 22] npm: [10, 11] - runs-on: ubuntu-latest-16-cores + runs-on: ubuntu-latest env: # The "default" npm is the one that ships with a given version of node. # For more: https://nodejs.org/en/download/releases/ @@ -400,7 +400,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} test-extra-features: - runs-on: ubuntu-latest-16-cores + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4