iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(dev-infra): do not set lts dist tag on packages from release-candidate train (#41946) 

Currently if a major release-train in the `release-candidate`/`feature-freeze`
phase becomes `latest`, we intend to set the NPM LTS dist tag for all packages
of the previous major (as the old release train in `latest` moves into LTS phase).

The logic for this exists but the release tool sets the NPM dist tag for
all packages of the new major. This means that the script might error if
a new package is part of the new major; or it could cause a deleted
package to not receive the LTS tag properly.

PR Close #41946
This commit is contained in:
Paul Gschwendtner 2021-05-04 17:09:51 +02:00 committed by Misko Hevery
parent 1758d02972
commit 5947239f89
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev-infra/ng-dev.js
View File

@ -6500,16 +6500,17 @@ class CutStableAction extends ReleaseAction {
// If a new major version is published and becomes the "latest" release-train, we need // If a new major version is published and becomes the "latest" release-train, we need
// to set the LTS npm dist tag for the previous latest release-train (the current patch). // to set the LTS npm dist tag for the previous latest release-train (the current patch).
if (isNewMajor) { if (isNewMajor) {
const previousPatchVersion = this.active.latest.version; const previousPatch = this.active.latest;
const ltsTagForPatch = getLtsNpmDistTagOfMajor(previousPatchVersion.major); const ltsTagForPatch = getLtsNpmDistTagOfMajor(previousPatch.version.major);
// Instead of directly setting the NPM dist tags, we invoke the ng-dev command for // Instead of directly setting the NPM dist tags, we invoke the ng-dev command for
// setting the NPM dist tag to the specified version. We do this because release NPM // setting the NPM dist tag to the specified version. We do this because release NPM
// packages could be different in the previous patch branch, and we want to set the // packages could be different in the previous patch branch, and we want to set the
// LTS tag for all packages part of the last major. It would not be possible to set the // LTS tag for all packages part of the last major. It would not be possible to set the
// NPM dist tag for new packages part of the released major, nor would it be acceptable // NPM dist tag for new packages part of the released major, nor would it be acceptable
// to skip the LTS tag for packages which are no longer part of the new major. // to skip the LTS tag for packages which are no longer part of the new major.
yield this.checkoutUpstreamBranch(previousPatch.branchName);
yield invokeYarnInstallCommand(this.projectDir); yield invokeYarnInstallCommand(this.projectDir);
yield invokeSetNpmDistCommand(ltsTagForPatch, previousPatchVersion); yield invokeSetNpmDistCommand(ltsTagForPatch, previousPatch.version);
} }
yield this.cherryPickChangelogIntoNextBranch(newVersion, branchName); yield this.cherryPickChangelogIntoNextBranch(newVersion, branchName);
}); });

7
dev-infra/release/publish/actions/cut-stable.ts
View File

@ -39,8 +39,8 @@ export class CutStableAction extends ReleaseAction {
// If a new major version is published and becomes the "latest" release-train, we need // If a new major version is published and becomes the "latest" release-train, we need
// to set the LTS npm dist tag for the previous latest release-train (the current patch). // to set the LTS npm dist tag for the previous latest release-train (the current patch).
if (isNewMajor) { if (isNewMajor) {
const previousPatchVersion = this.active.latest.version; const previousPatch = this.active.latest;
const ltsTagForPatch = getLtsNpmDistTagOfMajor(previousPatchVersion.major); const ltsTagForPatch = getLtsNpmDistTagOfMajor(previousPatch.version.major);
// Instead of directly setting the NPM dist tags, we invoke the ng-dev command for // Instead of directly setting the NPM dist tags, we invoke the ng-dev command for
// setting the NPM dist tag to the specified version. We do this because release NPM // setting the NPM dist tag to the specified version. We do this because release NPM
@ -48,8 +48,9 @@ export class CutStableAction extends ReleaseAction {
// LTS tag for all packages part of the last major. It would not be possible to set the // LTS tag for all packages part of the last major. It would not be possible to set the
// NPM dist tag for new packages part of the released major, nor would it be acceptable // NPM dist tag for new packages part of the released major, nor would it be acceptable
// to skip the LTS tag for packages which are no longer part of the new major. // to skip the LTS tag for packages which are no longer part of the new major.
await this.checkoutUpstreamBranch(previousPatch.branchName);
await invokeYarnInstallCommand(this.projectDir); await invokeYarnInstallCommand(this.projectDir);
await invokeSetNpmDistCommand(ltsTagForPatch, previousPatchVersion); await invokeSetNpmDistCommand(ltsTagForPatch, previousPatch.version);
} }
await this.cherryPickChangelogIntoNextBranch(newVersion, branchName); await this.cherryPickChangelogIntoNextBranch(newVersion, branchName);

7
dev-infra/release/publish/test/cut-stable.spec.ts
View File

@ -70,6 +70,13 @@ describe('cut stable action', () => {
latest: new ReleaseTrain('10.0.x', parse('10.0.3')), latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
}); });
// Ensure that the NPM dist tag is set only for packages that were available in the previous
// major version. A spy has already been installed on the function.
(externalCommands.invokeSetNpmDistCommand as jasmine.Spy).and.callFake(() => {
expect(action.gitClient.head.ref?.name).toBe('10.0.x');
return Promise.resolve();
});
await expectStagingAndPublishWithCherryPick(action, '11.0.x', '11.0.0', 'latest'); await expectStagingAndPublishWithCherryPick(action, '11.0.x', '11.0.0', 'latest');
expect(externalCommands.invokeSetNpmDistCommand).toHaveBeenCalledTimes(1); expect(externalCommands.invokeSetNpmDistCommand).toHaveBeenCalledTimes(1);
expect(externalCommands.invokeSetNpmDistCommand) expect(externalCommands.invokeSetNpmDistCommand)