Skip to content

Windows CI fixes #28771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 2, 2024
Merged

Windows CI fixes #28771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
321714e
ci: add base Windows E2E tests to PRs
clydin Nov 1, 2024
e95079c
test: reduce flakiness of E2E rebuild test
clydin Nov 1, 2024
dac6b6b
fix(@angular/build): check referenced files against native file paths
clydin Nov 2, 2024
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
14 changes: 14 additions & 0 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,20 @@ 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-windows-subset:
runs-on: windows-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@a3d0749c4d64959e85843fbeb54507e830be0f44
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@a3d0749c4d64959e85843fbeb54507e830be0f44
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@a3d0749c4d64959e85843fbeb54507e830be0f44
- name: Run CLI E2E tests
run: yarn bazel test --config=e2e //tests/legacy-cli:e2e_node22 --test_filter="tests/basic/{build,rebuild}.ts" --test_arg="--esbuild"

e2e-package-managers:
strategy:
fail-fast: false
Expand Down
3 changes: 1 addition & 2 deletions packages/angular/build/src/tools/esbuild/angular/source-file-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export class SourceFileCache extends Map<string, ts.SourceFile> {
for (let file of files) {
file = path.normalize(file);
invalid = this.loadResultCache.invalidate(file) || invalid;
invalid = extraWatchFiles.has(file) || invalid;

// Normalize separators to allow matching TypeScript Host paths
if (USING_WINDOWS) {
Expand All @@ -44,8 +45,6 @@ export class SourceFileCache extends Map<string, ts.SourceFile> {

invalid = this.delete(file) || invalid;
this.modifiedFiles.add(file);

invalid = extraWatchFiles.has(file) || invalid;
}

return invalid;
Expand Down
2 changes: 1 addition & 1 deletion tests/legacy-cli/e2e/tests/basic/rebuild.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ngServe } from '../../utils/project';

export default async function () {
const esbuild = getGlobalVariable('argv')['esbuild'];
const validBundleRegEx = esbuild ? /complete\./ : /Compiled successfully\./;
const validBundleRegEx = esbuild ? /sent to client/ : /Compiled successfully\./;
const lazyBundleRegEx = esbuild ? /chunk-/ : /src_app_lazy_lazy_component_ts\.js/;

// Disable component stylesheet HMR to support page reload based rebuild testing.
Expand Down
Loading