ci: migrate rebase-pr CI script to the circleci directory#39592
Closed
josephperrott wants to merge 2 commits into
Closed
ci: migrate rebase-pr CI script to the circleci directory#39592josephperrott wants to merge 2 commits into
josephperrott wants to merge 2 commits into
Conversation
eb736d2 to
861be94
Compare
861be94 to
4a33235
Compare
gkalpak
approved these changes
Nov 21, 2020
Member
gkalpak
left a comment
There was a problem hiding this comment.
A couple of minor comments/questions. Otherwise lgtm 👍
Also, consider adding a comment on why we don't use the ng-dev command on CI.
Contributor
|
FYI, adding "cleanup" label based on comments from @gkalpak. Thank you. |
Migrate the rebase-pr script used on CI out of tools and into the circleci directory. Additionally removes its support for running in the local repository as this is now better handled by `ng-dev pr rebase <pr-number>`.
5d9bb49 to
e601633
Compare
AndrewKushnir
pushed a commit
that referenced
this pull request
Nov 23, 2020
Migrate the rebase-pr script used on CI out of tools and into the circleci directory. Additionally removes its support for running in the local repository as this is now better handled by `ng-dev pr rebase <pr-number>`. PR Close #39592
gkalpak
added a commit
to gkalpak/angular
that referenced
this pull request
Dec 16, 2020
As part of the `setup` CI job (which is a prerequisite for all other CI jobs), we rebase the current code on master to make sure the PR changes are compatible with the latest code from master, even if the PR has not been rebased recently. When it is not possible to automatically rebase (i.e. when there are conflicts that need to be resolved manually), the job and subsequently the entire workflow should fail. This behavior has been accidentally broken in angular#39592, so that the job would succeed even if the rebase operation failed. This commit fixes it by ensuring the `exec()` helper used in `rebase-pr.js` will throw an error if the underlying command execution fails. Previously, the function would always return stdout output as a string and attach a `code` property indicating the exit code of the command. Since the exit code isn't necessary in the `rebase-pr.js` script, this commit simplifies the `exec()` helper by making it return the stdout output as a plain string (without extra properties) and re-throw any errors (unless the `ignoreError` argument is set to `true`). (Initially reported [here][1] by @JoostK.) [1]: https://angular-team.slack.com/archives/C042EU9T5/p1608070403128900
josephperrott
pushed a commit
that referenced
this pull request
Dec 17, 2020
As part of the `setup` CI job (which is a prerequisite for all other CI jobs), we rebase the current code on master to make sure the PR changes are compatible with the latest code from master, even if the PR has not been rebased recently. When it is not possible to automatically rebase (i.e. when there are conflicts that need to be resolved manually), the job and subsequently the entire workflow should fail. This behavior has been accidentally broken in #39592, so that the job would succeed even if the rebase operation failed. This commit fixes it by ensuring the `exec()` helper used in `rebase-pr.js` will throw an error if the underlying command execution fails. Previously, the function would always return stdout output as a string and attach a `code` property indicating the exit code of the command. Since the exit code isn't necessary in the `rebase-pr.js` script, this commit simplifies the `exec()` helper by making it return the stdout output as a plain string (without extra properties) and re-throw any errors (unless the `ignoreError` argument is set to `true`). (Initially reported [here][1] by @JoostK.) [1]: https://angular-team.slack.com/archives/C042EU9T5/p1608070403128900 PR Close #40161
josephperrott
pushed a commit
that referenced
this pull request
Dec 17, 2020
As part of the `setup` CI job (which is a prerequisite for all other CI jobs), we rebase the current code on master to make sure the PR changes are compatible with the latest code from master, even if the PR has not been rebased recently. When it is not possible to automatically rebase (i.e. when there are conflicts that need to be resolved manually), the job and subsequently the entire workflow should fail. This behavior has been accidentally broken in #39592, so that the job would succeed even if the rebase operation failed. This commit fixes it by ensuring the `exec()` helper used in `rebase-pr.js` will throw an error if the underlying command execution fails. Previously, the function would always return stdout output as a string and attach a `code` property indicating the exit code of the command. Since the exit code isn't necessary in the `rebase-pr.js` script, this commit simplifies the `exec()` helper by making it return the stdout output as a plain string (without extra properties) and re-throw any errors (unless the `ignoreError` argument is set to `true`). (Initially reported [here][1] by @JoostK.) [1]: https://angular-team.slack.com/archives/C042EU9T5/p1608070403128900 PR Close #40161
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Migrate the rebase-pr script used on CI out of tools and into the circleci
directory. Additionally removes its support for running in the local
repository as this is now better handled by
ng-dev pr rebase <pr-number>.