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.
alan-agius4 · Jun 13, 2024 · 2508cb0 · 2508cb0
1 parent 44f9a11
commit 2508cb0
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,7 +75,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         node: [18, 20, 22]
-        subset: [npm, yarn, pnpm, esbuild]
+        subset: [npm, esbuild]
         shard: [0, 1, 2, 3, 4, 5]
         exclude:
           # Skip yarn subset on Windows
@@ -90,18 +90,6 @@ jobs:
           # Skip Node.js v20 tests on Windows
           - os: windows-latest
             node: 20
-          # Skip yarn subset on Node.js 20
-          - node: 20
-            subset: yarn
-          # Skip pnpm subset on Node.js 20
-          - node: 20
-            subset: pnpm
-          # Skip yarn subset on Node.js 18
-          - node: 18
-            subset: yarn
-          # Skip pnpm subset on Node.js 18
-          - node: 18
-            subset: pnpm
     runs-on: ${{ matrix.os }}
     steps:
       - name: Initialize environment
@@ -115,6 +103,27 @@ jobs:
       - name: Run CLI E2E tests
         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 }}
 
+  e2e-package-managers:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        node: [22]
+        subset: [yarn, pnpm]
+        shard: [0, 1, 2]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Initialize environment
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@03b8a7dffd1205e061f0bee949024ebefc2a6592
+      - name: Install node modules
+        run: yarn install --immutable
+      - name: Setup Bazel
+        uses: angular/dev-infra/github-actions/bazel/setup@03b8a7dffd1205e061f0bee949024ebefc2a6592
+      - name: Setup Bazel RBE
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@03b8a7dffd1205e061f0bee949024ebefc2a6592
+      - name: Run CLI E2E tests
+        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 }}
+
   e2e-snapshots:
     strategy:
       fail-fast: false

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -107,7 +107,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         node: [22]
-        subset: [npm, yarn, pnpm, esbuild]
+        subset: [npm, esbuild]
         shard: [0, 1, 2, 3, 4, 5]
     runs-on: ${{ matrix.os }}
     steps:
@@ -122,6 +122,27 @@ jobs:
       - name: Run CLI E2E tests
         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 }}
 
+  e2e-package-managers:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        node: [22]
+        subset: [yarn, pnpm]
+        shard: [0, 1, 2]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Initialize environment
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@03b8a7dffd1205e061f0bee949024ebefc2a6592
+      - name: Install node modules
+        run: yarn install --immutable
+      - name: Setup Bazel
+        uses: angular/dev-infra/github-actions/bazel/setup@03b8a7dffd1205e061f0bee949024ebefc2a6592
+      - name: Setup Bazel RBE
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@03b8a7dffd1205e061f0bee949024ebefc2a6592
+      - name: Run CLI E2E tests
+        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 }}
+
   e2e-snapshots:
     needs: analyze
     if: needs.analyze.outputs.snapshots == 'true'