ci: use W3C-compliant Sauce Labs tunnelName and remove deprecated tunnelIdentifier

Author: alan-agius4

.github/workflows/ci.yml

@@ -219,6 +219,7 @@ jobs:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Start Sauce Connect
         uses: saucelabs/sauce-connect-action@cb88b508c6f9ff4d84490093733315dbd55de022 # v3
+        timeout-minutes: 10
         with:
           username: ${{ vars.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

.github/workflows/pr.yml

@@ -1,7 +1,7 @@
 name: Pull Request
 
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, synchronize, reopened]
 
 concurrency:
@@ -15,59 +15,6 @@ defaults:
     shell: bash
 
 jobs:
-  analyze:
-    runs-on: ubuntu-latest
-    outputs:
-      snapshots: ${{ steps.filter.outputs.snapshots }}
-    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          persist-credentials: false
-      - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
-        id: filter
-        with:
-          filters: |
-            snapshots:
-              - 'tests/e2e/ng-snapshot/package.json'
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Setup ESLint Caching
-        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: .eslintcache
-          key: ${{ runner.os }}-${{ hashFiles('.eslintrc.json') }}
-      - name: Install node modules
-        run: pnpm install --frozen-lockfile
-      - name: Generate JSON schema types
-        # Schema types are required to correctly lint the TypeScript code
-        run: pnpm run build-schema
-      - name: Run ESLint
-        run: pnpm lint --cache-strategy content
-      - name: Validate NgBot Configuration
-        run: pnpm ng-dev ngbot verify
-      - name: Validate Circular Dependencies
-        run: pnpm ts-circular-deps check
-      - name: Run Validation
-        run: pnpm admin validate
-      - name: Check tooling setup
-        run: pnpm check-tooling-setup
-      - name: Check commit message
-        # Commit message validation is only done on pull requests as its too late to validate once
-        # it has been merged.
-        run: pnpm ng-dev commit-message validate-range ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}
-      - name: Check code format
-        # Code formatting checks are only done on pull requests as its too late to validate once
-        # it has been merged.
-        run: pnpm ng-dev format changed --check ${{ github.event.pull_request.base.sha }}
-      - name: Check Package Licenses
-        uses: angular/dev-infra/github-actions/linting/licenses@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-
   build:
     runs-on: ubuntu-latest
     steps:
@@ -88,30 +35,12 @@ jobs:
           path: dist/releases/*.tgz
           retention-days: 14
 
-  test:
+  test-saucelabs:
     needs: build
     runs-on: ubuntu-latest
-    steps:
-      - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Install node modules
-        run: pnpm install --frozen-lockfile
-      - name: Run module and package tests
-        run: pnpm bazel test -- //... -//tests/...
-
-  e2e:
-    needs: build
-    strategy:
-      fail-fast: false
-      matrix:
-        node: [22]
-        subset: [esbuild, webpack]
-        shard: [0, 1, 2, 3, 4, 5]
-    runs-on: ubuntu-latest
+    name: Browser Compatibility Tests
+    env:
+      SAUCE_TUNNEL_IDENTIFIER: 'angular-${{ github.run_number }}'
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
@@ -121,96 +50,16 @@ jobs:
         uses: angular/dev-infra/github-actions/bazel/setup@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Run CLI E2E tests
-        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.${{ matrix.subset }}_node${{ matrix.node }}
-
-  build-e2e-windows-subset:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Install node modules
-        run: pnpm install --frozen-lockfile
-      - name: Build E2E tests for Windows on Linux
-        run: |
-          pnpm bazel build \
-            --config=e2e \
-            //tests:e2e.esbuild_node24 \
-            --platforms=tools:windows_x64
-      - name: Store built Windows E2E tests
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: win-e2e-build-artifacts
-          path: |
-            dist/bin/tests/**
-            !**/node_modules/**
-          retention-days: 1
-          if-no-files-found: 'error'
-
-  e2e-windows-subset:
-    needs: build-e2e-windows-subset
-    runs-on: windows-2025
-    steps:
-      - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Install node modules
-        run: pnpm install --frozen-lockfile
-      - name: Download built Windows E2E tests
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: win-e2e-build-artifacts
-          path: dist/bin/tests/
-      - name: Run CLI E2E tests
-        uses: ./.github/shared-actions/windows-bazel-test
+      - name: Start Sauce Connect
+        uses: saucelabs/sauce-connect-action@cb88b508c6f9ff4d84490093733315dbd55de022 # v3
+        timeout-minutes: 10
         with:
-          test_target_name: e2e.esbuild_node24
+          username: ${{ vars.SAUCE_USERNAME }}
+          accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+          region: us-west-1
+          tunnelName: ${{ env.SAUCE_TUNNEL_IDENTIFIER }}
+      - name: Run E2E Browser tests
         env:
-          E2E_SHARD_TOTAL: 1
-          TESTBRIDGE_TEST_ONLY: tests/basic/{build,rebuild,serve}.ts
-
-  e2e-package-managers:
-    needs: build
-    strategy:
-      fail-fast: false
-      matrix:
-        node: [22]
-        subset: [yarn, pnpm, bun]
-        shard: [0, 1, 2]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Install node modules
-        run: pnpm install --frozen-lockfile
-      - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Run CLI E2E tests
-        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.${{ matrix.subset }}_node${{ matrix.node }}
-
-  e2e-snapshots:
-    needs: [analyze, build]
-    if: needs.analyze.outputs.snapshots == 'true'
-    strategy:
-      fail-fast: false
-      matrix:
-        node: [22]
-        subset: [esbuild, webpack]
-        shard: [0, 1, 2, 3, 4, 5]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Install node modules
-        run: pnpm install --frozen-lockfile
-      - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@24ba9709ca4bf6548bba6a9abfe2799e90645a60 # main
-      - name: Run CLI E2E tests
-        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
+          SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
+          SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
+        run: pnpm bazel test --config=saucelabs //tests:e2e.saucelabs

tests/e2e/assets/protractor-saucelabs.conf.js

@@ -64,18 +64,15 @@ exports.config = {
   // NOTE: https://saucelabs.com/products/platform-configurator can be used to determine configuration values
   multiCapabilities: capabilities.map((caps) => {
     const w3cCaps = {
-      ...caps,
+      browserName: caps.browserName,
       browserVersion: caps.version,
       platformName: caps.platform,
     };
 
     if (tunnelIdentifier) {
       return {
         ...w3cCaps,
-        tunnelIdentifier,
-        tunnelName: tunnelIdentifier,
         'sauce:options': {
-          tunnelIdentifier,
           tunnelName: tunnelIdentifier,
         },
       };