Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

8 changes: 4 additions & 4 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ build --nolegacy_external_runfiles
# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
# https://github.com/bazelbuild/bazel/issues/7026 for more details.
# This flag is needed to so that the bazel cache is not invalidated
# when running bazel via `yarn bazel`.
# when running bazel via `pnpm bazel`.
# See https://github.com/angular/angular/issues/27514.
build --incompatible_strict_action_env
run --incompatible_strict_action_env
Expand Down Expand Up @@ -83,14 +83,14 @@ test:saucelabs --define=KARMA_WEB_TEST_MODE=SL_REQUIRED
# Releases should always be stamped with version control info
# This command assumes node on the path and is a workaround for
# https://github.com/bazelbuild/bazel/issues/4802
build:release --workspace_status_command="yarn ng-dev release build-env-stamp --mode=release"
build:release --workspace_status_command="pnpm -s ng-dev release build-env-stamp --mode=release"
build:release --stamp

build:snapshot --workspace_status_command="yarn ng-dev release build-env-stamp --mode=snapshot"
build:snapshot --workspace_status_command="pnpm -s ng-dev release build-env-stamp --mode=snapshot"
build:snapshot --stamp
build:snapshot --//:enable_snapshot_repo_deps

build:e2e --workspace_status_command="yarn ng-dev release build-env-stamp --mode=release"
build:e2e --workspace_status_command="pnpm -s ng-dev release build-env-stamp --mode=release"
build:e2e --stamp
test:e2e --test_timeout=3600 --experimental_ui_max_stdouterr_bytes=2097152

Expand Down
8 changes: 6 additions & 2 deletions .github/shared-actions/windows-bazel-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,21 @@ runs:
with:
wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'

- name: Installing pnpm (in WSL)
run: npm install -g pnpm@9
shell: wsl-bash {0}

- name: Install node modules in WSL (re-using from previous install/cache restore)
run: |
cd ${{steps.init_wsl.outputs.repo_path}}
yarn install --immutable
pnpm install --frozen-lockfile
shell: wsl-bash {0}

- name: Build test binary for Windows (inside WSL)
shell: wsl-bash {0}
run: |
cd ${{steps.init_wsl.outputs.repo_path}}
yarn bazel \
pnpm bazel \
build --config=e2e //tests/legacy-cli:${{inputs.test_target_name}} --platforms=tools:windows_x64
env:
# See: https://devblogs.microsoft.com/commandline/share-environment-vars-between-wsl-and-windows
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,51 +21,51 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
- name: Generate JSON schema types
# Schema types are required to correctly lint the TypeScript code
run: yarn admin build-schema
run: pnpm admin build-schema
- name: Run ESLint
run: yarn lint --cache-strategy content
run: pnpm lint --cache-strategy content
- name: Validate NgBot Configuration
run: yarn ng-dev ngbot verify
run: pnpm ng-dev ngbot verify
- name: Validate Circular Dependencies
run: yarn ts-circular-deps check
run: pnpm ts-circular-deps check
- name: Run Validation
run: yarn admin validate
run: pnpm admin validate
- name: Check tooling setup
run: yarn check-tooling-setup
run: pnpm check-tooling-setup

build:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
- name: Build release targets
run: yarn ng-dev release build
run: pnpm ng-dev release build

test:
needs: build
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
- name: Run module and package tests
run: yarn bazel test //modules/... //packages/...
run: pnpm bazel test //modules/... //packages/...
env:
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'

Expand All @@ -81,15 +81,15 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

e2e_windows:
strategy:
Expand All @@ -102,7 +102,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Run CLI E2E tests
uses: ./.github/shared-actions/windows-bazel-test
with:
Expand All @@ -123,15 +123,15 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

e2e-snapshots:
needs: test
Expand All @@ -145,15 +145,15 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Run CLI E2E tests
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}

browsers:
needs: build
Expand All @@ -163,9 +163,9 @@ jobs:
SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Setup Bazel RBE
Expand All @@ -182,7 +182,7 @@ jobs:
run: |
./scripts/saucelabs/start-tunnel.sh &
./scripts/saucelabs/wait-for-tunnel.sh
yarn bazel test --config=saucelabs //tests/legacy-cli:e2e.saucelabs
pnpm bazel test --config=saucelabs //tests/legacy-cli:e2e.saucelabs
./scripts/saucelabs/stop-tunnel.sh
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
if: ${{ failure() }}
Expand All @@ -197,11 +197,11 @@ jobs:
CIRCLE_BRANCH: ${{ github.ref_name }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- run: yarn admin snapshots --verbose
- run: pnpm admin snapshots --verbose
env:
SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}
12 changes: 6 additions & 6 deletions .github/workflows/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
workflows: ${{ steps.workflows.outputs.workflows }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
- id: workflows
run: echo "workflows=$(yarn ng-dev perf workflows --list)" >> "$GITHUB_OUTPUT"
run: echo "workflows=$(pnpm -s ng-dev perf workflows --list)" >> "$GITHUB_OUTPUT"

workflow:
timeout-minutes: 30
Expand All @@ -38,11 +38,11 @@ jobs:
workflow: ${{ fromJSON(needs.list.outputs.workflows) }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f2a610b26cd7a451eddd50eb071dc495e3346a80
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
- name: Install node modules
run: yarn install --immutable
run: pnpm install --frozen-lockfile
# We utilize the google-github-actions/auth action to allow us to get an active credential using workflow
# identity federation. This allows us to request short lived credentials on demand, rather than storing
# credentials in secrets long term. More information can be found at:
Expand All @@ -52,4 +52,4 @@ jobs:
project_id: 'internal-200822'
workload_identity_provider: 'projects/823469418460/locations/global/workloadIdentityPools/measurables-tracking/providers/angular'
service_account: 'measures-uploader@internal-200822.iam.gserviceaccount.com'
- run: yarn ng-dev perf workflows --name ${{ matrix.workflow }} --commit-sha ${{github.sha}}
- run: pnpm ng-dev perf workflows --name ${{ matrix.workflow }} --commit-sha ${{github.sha}}
Loading
Loading