File tree Expand file tree Collapse file tree 2 files changed +4
-227
lines changed Expand file tree Collapse file tree 2 files changed +4
-227
lines changed Original file line number Diff line number Diff line change @@ -149,25 +149,17 @@ orbs:
149149 # to make sure that snapshot builds are not deployed out of order, resulting in Git
150150 # push conflicts.
151151 queue : eddiewebb/queue@1.5.0
152+ devinfra : angular/dev-infra@1.0.2
152153
153154commands :
154155 checkout_and_rebase :
155156 description : Checkout and rebase the repository
156157 steps :
157158 - checkout
158159 # After checkout, rebase on top of target branch.
159- - run :
160- name : Rebase PR on target branch
161- environment :
162- CIRCLE_GIT_BASE_REVISION : << pipeline.git.base_revision >>
163- CIRCLE_GIT_REVISION : << pipeline.git.revision >>
164- command : |
165- if [ -n "$CIRCLE_PR_NUMBER" ]; then
166- # User is required for rebase.
167- git config user.name "angular-ci"
168- git config user.email "angular-ci"
169- node .circleci/rebase-pr.js
170- fi
160+ - devinfra/rebase-pr-on-target-branch :
161+ base_revision : << pipeline.git.base_revision >>
162+ head_revision : << pipeline.git.revision >>
171163
172164# -----------------------------------------------------------------------------------------
173165# Job definitions. Jobs which are defined just here, will not run automatically. Each job
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments