Skip to content

Commit 81e4257

Browse files
josephperrottdylhunn
authored andcommitted
build: remove dev-infra directory and migrate to relying on @angular/dev-infra-private-builds (angular#43061)
Remove the dev-infra directory and complete the migration to using the code generated by the angular/dev-infra repository. PR Close angular#43061
1 parent 30bf472 commit 81e4257

File tree

323 files changed

+547
-26525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+547
-26525
lines changed

.bazelrc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ build:remote --cpu=k8
114114
build:remote --host_cpu=k8
115115

116116
# Toolchain and platform related flags
117-
build:remote --crosstool_top=//dev-infra/bazel/remote-execution/cpp:cc_toolchain_suite
118-
build:remote --extra_toolchains=//dev-infra/bazel/remote-execution/cpp:cc_toolchain
119-
build:remote --extra_execution_platforms=//dev-infra/bazel/remote-execution:platform
120-
build:remote --host_platform=//dev-infra/bazel/remote-execution:platform
121-
build:remote --platforms=//dev-infra/bazel/remote-execution:platform
117+
build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
118+
build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
119+
build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
120+
build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
121+
build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
122122

123123
# Remote instance and caching
124124
build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance

.github/angular-robot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ merge:
3838
- 'modules/benchmarks/**'
3939
- 'modules/system.d.ts'
4040
- 'packages/**'
41-
- 'dev-infra/benchmark/driver-utilities/**'
4241
# list of patterns to ignore for the files changed by the PR
4342
exclude:
4443
- 'packages/*'

.gitmessage

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ Fixes #<issue number>
106106
# │ └─⫸ Commit Scope: animations|bazel|benchpress|common|compiler|compiler-cli|core|
107107
# │ elements|forms|http|language-service|localize|platform-browser|
108108
# │ platform-browser-dynamic|platform-server|router|service-worker|
109-
# │ upgrade|zone.js|packaging|changelog|dev-infra|docs-infra|migrations|
110-
# │ ngcc|ve
109+
# │ upgrade|zone.js|packaging|changelog|docs-infra|migrations|ngcc|ve
111110
# │ https://github.com/angular/angular/blob/master/CONTRIBUTING.md#scope
112111
# │
113112
# └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|style|test

.ng-dev/caretaker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {CaretakerConfig} from '../dev-infra/caretaker/config';
1+
import {CaretakerConfig} from '@angular/dev-infra-private/ng-dev/caretaker/config';
22

33
/** The configuration for `ng-dev caretaker` commands. */
44
export const caretaker: CaretakerConfig = {

.ng-dev/commit-message.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {CommitMessageConfig} from '../dev-infra/commit-message/config';
1+
import {CommitMessageConfig} from '@angular/dev-infra-private/ng-dev/commit-message/config';
22

33
/**
44
* The configuration for `ng-dev commit-message` commands.

.ng-dev/format.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {FormatConfig} from '../dev-infra/format/config';
1+
import {FormatConfig} from '@angular/dev-infra-private/ng-dev/format/config';
22

33
/**
44
* Configuration for the `ng-dev format` command.

.ng-dev/github.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {GithubConfig} from '../dev-infra/utils/config';
1+
import {GithubConfig} from '@angular/dev-infra-private/ng-dev/utils/config';
22

33
/**
44
* Github configuration for the `ng-dev` command. This repository is used as

.ng-dev/merge.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {DevInfraMergeConfig} from '../dev-infra/pr/merge/config';
2-
import {getDefaultTargetLabelConfiguration} from '../dev-infra/pr/merge/defaults';
1+
import {DevInfraMergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/config';
2+
import {getDefaultTargetLabelConfiguration} from '@angular/dev-infra-private/ng-dev/pr/merge/defaults';
33
import {github} from './github';
44
import {release} from './release';
55

.ng-dev/release.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev/release/config';
12
import {join} from 'path';
2-
import {ReleaseConfig} from '../dev-infra/release/config';
33

44
/** Configuration for the `ng-dev release` command. */
55
export const release: ReleaseConfig = {

.pullapprove.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,6 @@ groups:
11551155
'.ng-dev/**',
11561156
'.vscode/**',
11571157
'.yarn/**',
1158-
'dev-infra/**',
11591158
'docs/*.md',
11601159
'docs/images/**',
11611160
'goldens/*',

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@ Any line of the commit message cannot be longer than 100 characters.
248248
│ └─⫸ Commit Scope: animations|bazel|benchpress|common|compiler|compiler-cli|core|
249249
│ elements|forms|http|language-service|localize|platform-browser|
250250
│ platform-browser-dynamic|platform-server|router|service-worker|
251-
│ upgrade|zone.js|packaging|changelog|dev-infra|docs-infra|migrations|
252-
│ ngcc|ve
251+
│ upgrade|zone.js|packaging|changelog|docs-infra|migrations|ngcc|ve
253252
254253
└─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|test
255254
```
@@ -302,7 +301,7 @@ There are currently a few exceptions to the "use package name" rule:
302301
303302
* `changelog`: used for updating the release notes in CHANGELOG.md
304303
305-
* `dev-infra`: used for dev-infra related changes within the directories /scripts, /tools and /dev-infra
304+
* `dev-infra`: used for dev-infra related changes within the directories /scripts and /tools
306305
307306
* `docs-infra`: used for docs-app (angular.io) related changes within the /aio directory of the repo
308307

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
4444

4545
web_test_repositories()
4646

47-
load("//dev-infra/bazel/browsers:browser_repositories.bzl", "browser_repositories")
47+
load("@npm//@angular/dev-infra-private/bazel/browsers:browser_repositories.bzl", "browser_repositories")
4848

4949
browser_repositories()
5050

dev-infra/BUILD.bazel

Lines changed: 0 additions & 116 deletions
This file was deleted.

dev-infra/bazel/BUILD.bazel

Lines changed: 0 additions & 13 deletions
This file was deleted.

dev-infra/bazel/api-golden/BUILD.bazel

Lines changed: 0 additions & 35 deletions
This file was deleted.

dev-infra/bazel/api-golden/find_entry_points.ts

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)