Skip to content

Commit bd61bc3

Browse files
authored
build: prepare for v15 and exceptional minors for v14 (#25146)
1 parent 6369204 commit bd61bc3

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

.ng-dev/pull-request.mts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ export const pullRequest: PullRequestConfig = {
1616
mergeReadyLabel: 'merge ready',
1717
commitMessageFixupLabel: 'commit message fixup',
1818
caretakerNoteLabel: 'caretaker note',
19+
20+
// TODO(EXCEPTIONAL_MINOR): Remove this when v15 moves into RC / or when exceptional
21+
// minors are supported.
22+
__specialTreatRcAsExceptionalMinor: true,
1923
};

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"ci-notify-slack-failure": "ts-node --esm --project scripts/tsconfig.json scripts/circleci/notify-slack-job-failure.mts",
5555
"prepare": "husky install"
5656
},
57-
"version": "14.1.0-next.2",
57+
"version": "15.0.0-next.0",
5858
"dependencies": {
5959
"@angular/animations": "^14.0.1",
6060
"@angular/common": "^14.0.1",
@@ -76,7 +76,7 @@
7676
"@angular/bazel": "^14.0.1",
7777
"@angular/cli": "^14.0.1",
7878
"@angular/compiler-cli": "^14.0.1",
79-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#f2ca0a57e8ede868dc51c3b80a0d3ca56d5fdf65",
79+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#714bb709f6d7ee3386a7f1097a75a54ab92c285d",
8080
"@angular/localize": "^14.0.1",
8181
"@angular/platform-browser-dynamic": "^14.0.1",
8282
"@angular/platform-server": "^14.0.1",

scripts/docs-deploy/deploy-ci-push.mts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ async function main() {
3030

3131
if (branchName === active.next.branchName) {
3232
const major = active.next.version.major;
33-
const targets = [{projectId, description, site: sites.next}];
33+
34+
const targets = [
35+
// TODO(EXCEPTIONAL_MINOR): Restore the original logic for `next.material.angular.io`.
36+
// {projectId, description, site: sites.next}
37+
];
3438

3539
// If the next release train is for a new major that is not published as part of the
3640
// other active release trains, we also publish to e.g. `v14.material.angular.io`.
@@ -68,7 +72,11 @@ async function main() {
6872

6973
if (branchName === active.releaseCandidate?.branchName) {
7074
const major = active.releaseCandidate.version.major;
71-
const targets = [{projectId, description, site: sites.rc}];
75+
const targets = [
76+
// TODO(EXCEPTIONAL_MINOR): Restore the original logic for `next.material.angular.io`.
77+
{projectId, description, site: sites.next},
78+
{projectId, description, site: sites.rc},
79+
];
7280

7381
// If the RC is for a new major that `latest` does not publish yet, we will deploy
7482
// the dedicated major site like `v13.material.angular.io` using the `rc` branch.

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,9 @@
327327
dependencies:
328328
tslib "^2.3.0"
329329

330-
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#f2ca0a57e8ede868dc51c3b80a0d3ca56d5fdf65":
331-
version "0.0.0-04a54cdfa050a7b6ed1dab8f0054f85022827ed5"
332-
resolved "https://github.com/angular/dev-infra-private-builds.git#f2ca0a57e8ede868dc51c3b80a0d3ca56d5fdf65"
330+
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#714bb709f6d7ee3386a7f1097a75a54ab92c285d":
331+
version "0.0.0-3e07a8f0335813ddeee471c7c1db12325c07325e"
332+
resolved "https://github.com/angular/dev-infra-private-builds.git#714bb709f6d7ee3386a7f1097a75a54ab92c285d"
333333
dependencies:
334334
"@angular-devkit/build-angular" "14.1.0-next.1"
335335
"@angular/benchpress" "0.3.0"

0 commit comments

Comments
 (0)