Skip to content

Commit

Permalink
build: use shared circleci dev-infra for common circleci code
Browse files Browse the repository at this point in the history
This allows us to remove the duplicated `rebase-pr.js` script so that we can maintain this script in a single place.
  • Loading branch information
devversion committed Sep 23, 2022
1 parent 7a5ba93 commit 1e175aa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 221 deletions.
17 changes: 4 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ var_11: &only_release_branches
# https://circleci.com/developer/orbs.
orbs:
node: circleci/node@5.0.1
devinfra: angular/dev-infra@1.0.2

# Executor Definitions
# https://circleci.com/docs/2.0/reusing-config/#authoring-reusable-executors
Expand Down Expand Up @@ -218,19 +219,9 @@ jobs:
- checkout
- save_month_to_file
- init_environment
- run:
name: Rebase PR on target branch
# After checkout, rebase on top of target branch.
command: >
if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
# User is required for rebase.
git config user.name "angular-ci"
git config user.email "angular-ci"
# Rebase PR on top of target branch.
node .circleci/rebase-pr.js
else
echo "This build is not over a PR, nothing to do."
fi
- devinfra/rebase-pr-on-target-branch:
base_revision: << pipeline.git.base_revision >>
head_revision: << pipeline.git.revision >>
# This cache is saved in the build-npm-packages so that Bazel cache is also included.
- restore_cache:
keys:
Expand Down
208 changes: 0 additions & 208 deletions .circleci/rebase-pr.js

This file was deleted.

0 comments on commit 1e175aa

Please sign in to comment.