Skip to content

Commit 8450b3d

Browse files
committed
build: use shared circleci dev-infra for common circleci code
This allows us to remove the duplicated `rebase-pr.js` script so that we can maintain this script in a single place.
1 parent b8af554 commit 8450b3d

File tree

2 files changed

+4
-227
lines changed

2 files changed

+4
-227
lines changed

.circleci/config.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff 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/[email protected]
152+
devinfra: angular/[email protected]
152153

153154
commands:
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

.circleci/rebase-pr.js

Lines changed: 0 additions & 215 deletions
This file was deleted.

0 commit comments

Comments
 (0)