From dca00b7e2553d2b4d0cc3b7d5a9b91f352682d78 Mon Sep 17 00:00:00 2001
From: AleksanderBodurri <alexbodurri1117@gmail.com>
Date: Sun, 21 Nov 2021 20:53:55 -0500
Subject: [PATCH] build(devtools): disable the "Rebase PR on target branch"
 circleci job so that the PR that merges the unrelated history of
 rangle/angular-devtools can be successfully merged into angular/angular

Usually this job would ensure that all PRs in angular/angular are running against the latest changes to angular/angular. In order to merge the unrelated history of the commits in the rangle/angular-devtools repo into angular/angular, we must temporarily disable this job.
---
 .circleci/config.yml | 28 +++++++++++++++-------------
 .ng-dev/format.ts    |  1 +
 devtools/tslint.json |  1 -
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a7536570e37..37d501e91a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -237,19 +237,21 @@ 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
+
+      # TODO(aleksanderbodurri): renable this as soon as angular-devtools is tranfered into angular/angular
+      # - 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
       # This cache is saved in the build-npm-packages so that Bazel cache is also included.
       - restore_cache:
           keys:
diff --git a/.ng-dev/format.ts b/.ng-dev/format.ts
index a729d4201f6..3912aef4a2f 100644
--- a/.ng-dev/format.ts
+++ b/.ng-dev/format.ts
@@ -12,6 +12,7 @@ export const format: FormatConfig = {
   'clang-format': {
     'matchers': [
       '**/*.{js,ts}',
+      '!devtools/**',
       // TODO: burn down format failures and remove aio and integration exceptions.
       '!aio/**',
       '!integration/**',
diff --git a/devtools/tslint.json b/devtools/tslint.json
index 22709a26fd7..ec4f4ced565 100644
--- a/devtools/tslint.json
+++ b/devtools/tslint.json
@@ -14,7 +14,6 @@
     "directive-class-suffix": true,
     "directive-selector": [true, "attribute", ["ng", "app"], "camelCase"],
     "component-selector": [true, "element", ["ng", "app"], "kebab-case"],
-    "import-blacklist": [true, "rxjs/Rx"],
     "interface-name": false,
     "max-classes-per-file": false,
     "max-line-length": [true, 140],