angular-cn/dev-infra
Paul Gschwendtner c2c14c2a1f fix(dev-infra): incorrect base revision for merge script autosquash (#37138)
As mentioned in the previous commit, the autosquash strategy has
not been used in the components repo, so we could easily regress.

After thorough manual testing of the autosquash strategy again,
now that the merge script will be moved to framework, it came
to mind that there is a bug with the base revision in the
autosquash merge strategy. The problem is that the base revision
of a given PR is relying on the amount of commits in a PR.

This is prone to error because the amount of commits could easily
change in the autosquash merge strategy, because fixup or squash
commits will be collapsed. Basically invalidating the base revision.

To fix this, we fixate the base revision by determining the actual
SHA. This one is guaranteed to not change after the autosquash rebase.

The current merge script in framework fixates the revision by creating
a separate branch, but there is no benefit in that, compared to just
using an explicit SHA that doesn't need to be cleaned up..

PR Close #37138
2020-05-18 11:50:08 -07:00
..
commit-message fix(dev-infra): do not require a commit body for release commits (#37110) 2020-05-14 13:03:34 -07:00
format feat(dev-infra): introduce validators for ng-dev config loading (#37049) 2020-05-13 15:58:46 -07:00
pr fix(dev-infra): incorrect base revision for merge script autosquash (#37138) 2020-05-18 11:50:08 -07:00
pullapprove build(dev-infra): cleanup package dependencies for shared package (#36980) 2020-05-12 10:51:05 -07:00
release feat(dev-infra): create environment stamping script in ng-dev (#36844) 2020-05-01 10:00:04 -07:00
ts-circular-dependencies build(dev-infra): cleanup package dependencies for shared package (#36980) 2020-05-12 10:51:05 -07:00
utils feat(dev-infra): integrate merge script into ng-dev cli (#37138) 2020-05-18 11:50:08 -07:00
BUILD.bazel feat(dev-infra): create tool to determine conflicts created by a PR (#37051) 2020-05-15 11:29:35 -07:00
cli.ts feat(dev-infra): create tool to determine conflicts created by a PR (#37051) 2020-05-15 11:29:35 -07:00
ng-dev ci: use dev-infra cli from local sources (#36326) 2020-04-01 15:24:29 -07:00
tmpl-package.json feat(dev-infra): create tool to determine conflicts created by a PR (#37051) 2020-05-15 11:29:35 -07:00