Test

devversion · devversion · commit 70fefa1282ff · 2025-03-01T06:41:11.000Z
diff --git a/.github/shared-actions/windows-bazel-test/action.yml b/.github/shared-actions/windows-bazel-test/action.yml
@@ -22,19 +22,20 @@ runs:
 
     - name: Initialize WSL
       id: init_wsl
-      uses: angular/dev-infra/github-actions/setup-wsl@1e0e2edff67a23e606df18ac8a25a59249f23a60
+      uses: angular/dev-infra/github-actions/setup-wsl@10c9ccde0b22c30eefc13adc5a5121b5898902d1
       with:
         wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'
 
     - name: Install node modules in WSL (re-using from previous install/cache restore)
-      run: yarn install --immutable
-      working-directory: ${{steps.init_wsl.outputs.repo_path}}
+      run: |
+        cd ${{steps.init_wsl.outputs.repo_path}}
+        yarn install --immutable
       shell: wsl-bash {0}
 
     - name: Build test binary for Windows (inside WSL)
       shell: wsl-bash {0}
-      working-directory: ${{steps.init_wsl.outputs.repo_path}}
       run: |
+        cd ${{steps.init_wsl.outputs.repo_path}}
         yarn bazel \
           build --config=e2e //tests/legacy-cli:${{inputs.test_target_name}} --platforms=tools:windows_x64
       env:
@@ -43,17 +44,18 @@ runs:
 
     - name: Copying binary artifact to host
       shell: wsl-bash {0}
-      working-directory: ${{steps.init_wsl.outputs.repo_path}}
       run: |
+        cd ${{steps.init_wsl.outputs.repo_path}}
         tar -cf /tmp/test.tar.gz dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_
         mkdir /mnt/c/test
         mv /tmp/test.tar.gz /mnt/c/test
         (cd /mnt/c/test && tar -xf /mnt/c/test/test.tar.gz)
 
     - name: Convert symlinks for Windows host
       shell: wsl-bash {0}
-      working-directory: ${{steps.init_wsl.outputs.repo_path}}
       run: |
+        cd ${{steps.init_wsl.outputs.repo_path}}
+
         runfiles_dir="/mnt/c/test/dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles"
 
         # Make WSL symlinks compatible on Windows native file system.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -128,20 +128,14 @@ jobs:
   e2e-windows-subset:
     # needs: build
     runs-on: windows-2025
-    env:
-      ACTIONS_STEP_DEBUG: 'true'
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0000d926624b2fd918e93f1c6b5e2defba9af91f
-      - run: ls -alh D:/a/angular-cli/angular-cli
-        shell: bash
-      #- name: Run CLI E2E tests
-      #  uses: ./.github/shared-actions/windows-bazel-test
-      #  with:
-      #    test_target_name: e2e_node22
-      #    test_args: --esbuild --glob "tests/basic/{build,rebuild}.ts"
-      - run: ls -alh D:/a/angular-cli/angular-cli
-        shell: bash
+      - name: Run CLI E2E tests
+        uses: ./.github/shared-actions/windows-bazel-test
+        with:
+          test_target_name: e2e_node22
+          test_args: --esbuild --glob "tests/basic/{build,rebuild}.ts"
 
   #  e2e_windows:
   #    strategy:
diff --git a/packages/angular/build/BUILD.bazel b/packages/angular/build/BUILD.bazel
@@ -309,6 +309,6 @@ api_golden_test_npm_package(
         ":npm_package",
         "//goldens:public-api",
     ],
-    golden_dir = "angular_cli/goldens/public-api/angular/build",
-    npm_package = "angular_cli/packages/angular/build/npm_package",
+    golden_dir = "goldens/public-api/angular/build",
+    npm_package = "packages/angular/build/npm_package",
 )
diff --git a/packages/angular/ssr/BUILD.bazel b/packages/angular/ssr/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@aspect_rules_js//npm:defs.bzl", "npm_package")
-load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 load("//tools:defaults2.bzl", "ng_package", "ts_project")
@@ -90,6 +90,6 @@ api_golden_test_npm_package(
         ":npm_package",
         "//goldens:public-api",
     ],
-    golden_dir = "angular_cli/goldens/public-api/angular/ssr",
-    npm_package = "angular_cli/packages/angular/ssr/npm_package",
+    golden_dir = "goldens/public-api/angular/ssr",
+    npm_package = "packages/angular/ssr/npm_package",
 )
diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel
@@ -3,7 +3,7 @@
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.dev/license
 
-load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
@@ -122,7 +122,7 @@ api_golden_test_npm_package(
         ":npm_package",
         "//goldens:public-api",
     ],
-    golden_dir = "angular_cli/goldens/public-api/angular_devkit/architect",
-    npm_package = "angular_cli/packages/angular_devkit/architect/npm_package",
+    golden_dir = "goldens/public-api/angular_devkit/architect",
+    npm_package = "packages/angular_devkit/architect/npm_package",
 )
 # @external_end
diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel
@@ -3,7 +3,7 @@
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.dev/license
 
-load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
@@ -275,8 +275,8 @@ api_golden_test_npm_package(
         ":npm_package",
         "//goldens:public-api",
     ],
-    golden_dir = "angular_cli/goldens/public-api/angular_devkit/build_angular",
-    npm_package = "angular_cli/packages/angular_devkit/build_angular/npm_package",
+    golden_dir = "goldens/public-api/angular_devkit/build_angular",
+    npm_package = "packages/angular_devkit/build_angular/npm_package",
 )
 
 # Large build_angular specs
diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel
@@ -3,7 +3,7 @@
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.dev/license
 
-load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
@@ -120,6 +120,6 @@ api_golden_test_npm_package(
         ":npm_package",
         "//goldens:public-api",
     ],
-    golden_dir = "angular_cli/goldens/public-api/angular_devkit/build_webpack",
-    npm_package = "angular_cli/packages/angular_devkit/build_webpack/npm_package",
+    golden_dir = "goldens/public-api/angular_devkit/build_webpack",
+    npm_package = "packages/angular_devkit/build_webpack/npm_package",
 )
diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
@@ -90,8 +90,10 @@ api_golden_test_npm_package(
         ":npm_package",
         "//goldens:public-api",
     ],
-    golden_dir = "angular_cli/goldens/public-api/angular_devkit/core",
-    npm_package = "angular_cli/packages/angular_devkit/core/npm_package",
-    types = ["@npm//@types/node"],
+    golden_dir = "goldens/public-api/angular_devkit/core",
+    npm_package = "packages/angular_devkit/core/npm_package",
+    types = {
+        "node": "//:node_modules/@types/node",
+    },
 )
 # @external_end
diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 
@@ -85,7 +85,9 @@ api_golden_test_npm_package(
         ":npm_package",
         "//goldens:public-api",
     ],
-    golden_dir = "angular_cli/goldens/public-api/angular_devkit/schematics",
-    npm_package = "angular_cli/packages/angular_devkit/schematics/npm_package",
-    types = ["@npm//@types/node"],
+    golden_dir = "goldens/public-api/angular_devkit/schematics",
+    npm_package = "packages/angular_devkit/schematics/npm_package",
+    types = {
+        "//:node_modules/@types/node": "node",
+    },
 )
diff --git a/packages/ngtools/webpack/BUILD.bazel b/packages/ngtools/webpack/BUILD.bazel
@@ -88,6 +88,6 @@ api_golden_test_npm_package(
         ":npm_package",
         "//goldens:public-api",
     ],
-    golden_dir = "angular_cli/goldens/public-api/ngtools/webpack",
-    npm_package = "angular_cli/packages/ngtools/webpack/npm_package",
+    golden_dir = "goldens/public-api/ngtools/webpack",
+    npm_package = "packages/ngtools/webpack/npm_package",
 )
diff --git a/tests/legacy-cli/e2e/tests/build/styles/tailwind-v3.ts b/tests/legacy-cli/e2e/tests/build/styles/tailwind-v3.ts
@@ -30,7 +30,6 @@ export default async function () {
 
   // Ensure installation warning is present
   const { stderr } = await ng('build', '--configuration=development');
-  console.error(stderr);
   if (!stderr.includes("To enable Tailwind CSS, please install the 'tailwindcss' package.")) {
     throw new Error('Expected tailwind installation warning');
   }
diff --git a/tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts b/tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts
@@ -1,6 +1,12 @@
 import { join } from 'node:path';
 import { expectFileToMatch } from '../../utils/fs';
-import { execWithEnv, extractNpmEnv, ng, silentNpm } from '../../utils/process';
+import {
+  execWithEnv,
+  extractCIAndInfraEnv,
+  extractNpmEnv,
+  ng,
+  silentNpm,
+} from '../../utils/process';
 import { getActivePackageManager, installPackage, uninstallPackage } from '../../utils/packages';
 import { isPrereleaseCli } from '../../utils/project';
 import { appendFile, writeFile } from 'node:fs/promises';
@@ -48,6 +54,7 @@ async function publishOutdated(npmSpecifier: string): Promise<void> {
 
   await execWithEnv('npm', ['publish', stdoutPack.trim(), '--tag=outdated'], {
     ...extractNpmEnv(),
+    ...extractCIAndInfraEnv(),
     'NPM_CONFIG_USERCONFIG': npmrc,
   });
 }

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,6 @@ api_golden_test_npm_package(`
`309`	`309`	`":npm_package",`
`310`	`310`	`"//goldens:public-api",`
`311`	`311`	`],`
`312`		`- golden_dir = "angular_cli/goldens/public-api/angular/build",`
`313`		`- npm_package = "angular_cli/packages/angular/build/npm_package",`
	`312`	`+ golden_dir = "goldens/public-api/angular/build",`
	`313`	`+ npm_package = "packages/angular/build/npm_package",`
`314`	`314`	`)`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,6 @@ api_golden_test_npm_package(`
`88`	`88`	`":npm_package",`
`89`	`89`	`"//goldens:public-api",`
`90`	`90`	`],`
`91`		`- golden_dir = "angular_cli/goldens/public-api/ngtools/webpack",`
`92`		`- npm_package = "angular_cli/packages/ngtools/webpack/npm_package",`
	`91`	`+ golden_dir = "goldens/public-api/ngtools/webpack",`
	`92`	`+ npm_package = "packages/ngtools/webpack/npm_package",`
`93`	`93`	`)`