Skip to content

Commit 267641b

Browse files
committed
ci: split package managers and bundlers jobs
Currently, the package managers subset includes 27 tests. However, these tests are divided into 6 shards, which leads to inefficient use of resources.
1 parent 31b3eeb commit 267641b

File tree

2 files changed

+44
-14
lines changed

2 files changed

+44
-14
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
matrix:
7676
os: [ubuntu-latest, windows-latest]
7777
node: [18, 20, 22]
78-
subset: [npm, yarn, pnpm, esbuild]
78+
subset: [npm, esbuild]
7979
shard: [0, 1, 2, 3, 4, 5]
8080
exclude:
8181
# Skip yarn subset on Windows
@@ -90,18 +90,6 @@ jobs:
9090
# Skip Node.js v20 tests on Windows
9191
- os: windows-latest
9292
node: 20
93-
# Skip yarn subset on Node.js 20
94-
- node: 20
95-
subset: yarn
96-
# Skip pnpm subset on Node.js 20
97-
- node: 20
98-
subset: pnpm
99-
# Skip yarn subset on Node.js 18
100-
- node: 18
101-
subset: yarn
102-
# Skip pnpm subset on Node.js 18
103-
- node: 18
104-
subset: pnpm
10593
runs-on: ${{ matrix.os }}
10694
steps:
10795
- name: Initialize environment
@@ -115,6 +103,27 @@ jobs:
115103
- name: Run CLI E2E tests
116104
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
117105

106+
e2e-package-managers:
107+
strategy:
108+
fail-fast: false
109+
matrix:
110+
os: [ubuntu-latest]
111+
node: [22]
112+
subset: [yarn, pnpm]
113+
shard: [0, 1, 2]
114+
runs-on: ${{ matrix.os }}
115+
steps:
116+
- name: Initialize environment
117+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@03b8a7dffd1205e061f0bee949024ebefc2a6592
118+
- name: Install node modules
119+
run: yarn install --immutable
120+
- name: Setup Bazel
121+
uses: angular/dev-infra/github-actions/bazel/setup@03b8a7dffd1205e061f0bee949024ebefc2a6592
122+
- name: Setup Bazel RBE
123+
uses: angular/dev-infra/github-actions/bazel/configure-remote@03b8a7dffd1205e061f0bee949024ebefc2a6592
124+
- name: Run CLI E2E tests
125+
run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
126+
118127
e2e-snapshots:
119128
strategy:
120129
fail-fast: false

.github/workflows/pr.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
matrix:
108108
os: [ubuntu-latest]
109109
node: [22]
110-
subset: [npm, yarn, pnpm, esbuild]
110+
subset: [npm, esbuild]
111111
shard: [0, 1, 2, 3, 4, 5]
112112
runs-on: ${{ matrix.os }}
113113
steps:
@@ -122,6 +122,27 @@ jobs:
122122
- name: Run CLI E2E tests
123123
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
124124

125+
e2e-package-managers:
126+
strategy:
127+
fail-fast: false
128+
matrix:
129+
os: [ubuntu-latest]
130+
node: [22]
131+
subset: [yarn, pnpm]
132+
shard: [0, 1, 2]
133+
runs-on: ${{ matrix.os }}
134+
steps:
135+
- name: Initialize environment
136+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@03b8a7dffd1205e061f0bee949024ebefc2a6592
137+
- name: Install node modules
138+
run: yarn install --immutable
139+
- name: Setup Bazel
140+
uses: angular/dev-infra/github-actions/bazel/setup@03b8a7dffd1205e061f0bee949024ebefc2a6592
141+
- name: Setup Bazel RBE
142+
uses: angular/dev-infra/github-actions/bazel/configure-remote@03b8a7dffd1205e061f0bee949024ebefc2a6592
143+
- name: Run CLI E2E tests
144+
run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
145+
125146
e2e-snapshots:
126147
needs: analyze
127148
if: needs.analyze.outputs.snapshots == 'true'

0 commit comments

Comments
 (0)