Skip to content

Commit 4d314a5

Browse files
authored
Merge pull request #3397 from SalesforceCommerceCloud/improve-e2e-stability
Improve E2E stability
2 parents faa913a + 34adcfb commit 4d314a5

File tree

1 file changed

+12
-28
lines changed

1 file changed

+12
-28
lines changed

.github/workflows/e2e.yml

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,14 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
# Run all matrix env at once because we will not deploy demo app to MRT.
14-
node: [18, 20, 22]
15-
npm: [8, 9, 10, 11]
16-
exclude: # node 18 with npm 11 is not compatible
17-
- node: 18
18-
npm: 11
14+
node: [20, 22]
15+
npm: [10, 11]
1916
runs-on: ubuntu-latest
2017
env:
2118
# The "default" npm is the one that ships with a given version of node.
2219
# For more: https://nodejs.org/en/download/releases/
2320
# (We also use this env var for making sure a step runs once for the current node version)
24-
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
25-
IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
21+
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
2622
steps:
2723
- name: Checkout
2824
uses: actions/checkout@v4
@@ -67,18 +63,14 @@ jobs:
6763
max-parallel: 1
6864
matrix:
6965
# Run all matrix env at once because we will not deploy demo app to MRT.
70-
node: [18, 20, 22]
71-
npm: [8, 9, 10, 11]
72-
exclude: # node 18 with npm 11 is not compatible
73-
- node: 18
74-
npm: 11
66+
node: [20, 22]
67+
npm: [10, 11]
7568
runs-on: ubuntu-latest
7669
env:
7770
# The "default" npm is the one that ships with a given version of node.
7871
# For more: https://nodejs.org/en/download/releases/
7972
# (We also use this env var for making sure a step runs once for the current node version)
80-
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
81-
IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
73+
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
8274

8375
steps:
8476
- name: Checkout
@@ -183,18 +175,14 @@ jobs:
183175
max-parallel: 1
184176
matrix:
185177
# Run all matrix env at once because we will not deploy demo app to MRT.
186-
node: [18, 20, 22]
187-
npm: [8, 9, 10, 11]
188-
exclude: # node 18 with npm 11 is not compatible
189-
- node: 18
190-
npm: 11
178+
node: [20, 22]
179+
npm: [10, 11]
191180
runs-on: ubuntu-latest
192181
env:
193182
# The "default" npm is the one that ships with a given version of node.
194183
# For more: https://nodejs.org/en/download/releases/
195184
# (We also use this env var for making sure a step runs once for the current node version)
196-
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
197-
IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
185+
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
198186
# The current recommended version for Managed Runtime:
199187
# https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html
200188
IS_MRT_NODE: ${{ matrix.node == 22 && matrix.npm == 11 }}
@@ -303,18 +291,14 @@ jobs:
303291
max-parallel: 1
304292
matrix:
305293
# Run all matrix env at once because we will not deploy demo app to MRT.
306-
node: [18, 20, 22]
307-
npm: [8, 9, 10, 11]
308-
exclude: # node 18 with npm 11 is not compatible
309-
- node: 18
310-
npm: 11
294+
node: [20, 22]
295+
npm: [10, 11]
311296
runs-on: ubuntu-latest
312297
env:
313298
# The "default" npm is the one that ships with a given version of node.
314299
# For more: https://nodejs.org/en/download/releases/
315300
# (We also use this env var for making sure a step runs once for the current node version)
316-
# Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
317-
IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
301+
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
318302
steps:
319303
- name: Checkout
320304
uses: actions/checkout@v4

0 commit comments

Comments
 (0)