ci: extract rebase PR login into a common command

alan-agius4 · clydin · commit e96709e95fa1 · 2022-07-18T12:04:58.000-04:00
This reduces code duplicatation (cherry picked from commit 3ea0383)
diff --git a/.circleci/dynamic_config.yml b/.circleci/dynamic_config.yml
@@ -87,6 +87,22 @@ commands:
           name: Initialize Environment
           command: ./.circleci/env.sh
 
+  rebase_pr:
+    steps:
+      - run:
+          name: Rebase PR on target branch
+          shell: bash
+          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 tools/rebase-pr.js angular/angular-cli ${CIRCLE_PR_NUMBER}
+            else
+              echo "This build is not over a PR, nothing to do."
+            fi
+
   custom_attach_workspace:
     description: Attach workspace at a predefined location
     steps:
@@ -145,18 +161,7 @@ jobs:
     resource_class: medium
     steps:
       - checkout
-      - run:
-          name: Rebase PR on 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 tools/rebase-pr.js angular/angular-cli ${CIRCLE_PR_NUMBER}
-            else
-              echo "This build is not over a PR, nothing to do."
-            fi
+      - rebase_pr
       - initialize_env
       - restore_cache:
           keys:
@@ -309,18 +314,7 @@ jobs:
     parallelism: 8
     steps:
       - checkout
-      - run:
-          name: Rebase PR on target branch
-          command: |
-            if (Test-Path env:CIRCLE_PR_NUMBER) {
-              # 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 tools/rebase-pr.js angular/angular-cli $env:CIRCLE_PR_NUMBER
-            } else {
-              echo "This build is not over a PR, nothing to do."
-            }
+      - rebase_pr
       - setup_windows
       - restore_cache:
           keys:
