Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,25 +149,17 @@ orbs:
# to make sure that snapshot builds are not deployed out of order, resulting in Git
# push conflicts.
queue: eddiewebb/queue@1.5.0
devinfra: angular/dev-infra@1.0.2

commands:
checkout_and_rebase:
description: Checkout and rebase the repository
steps:
- checkout
# After checkout, rebase on top of target branch.
- run:
name: Rebase PR on target branch
environment:
CIRCLE_GIT_BASE_REVISION: << pipeline.git.base_revision >>
CIRCLE_GIT_REVISION: << pipeline.git.revision >>
command: |
if [ -n "$CIRCLE_PR_NUMBER" ]; then
# User is required for rebase.
git config user.name "angular-ci"
git config user.email "angular-ci"
node .circleci/rebase-pr.js
fi
- devinfra/rebase-pr-on-target-branch:
base_revision: << pipeline.git.base_revision >>
head_revision: << pipeline.git.revision >>

# -----------------------------------------------------------------------------------------
# Job definitions. Jobs which are defined just here, will not run automatically. Each job
Expand Down
215 changes: 0 additions & 215 deletions .circleci/rebase-pr.js

This file was deleted.