From 258d1782e3f01c0f7413ab94edfd6f9e5f7e5384 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 5 Feb 2021 13:29:59 -0500
Subject: [PATCH 1/2] ci: check CIRCLE_BRANCH when validating commits

---
 scripts/validate-commits.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/validate-commits.ts b/scripts/validate-commits.ts
index aafd3e9788fb..f243d5ca46da 100644
--- a/scripts/validate-commits.ts
+++ b/scripts/validate-commits.ts
@@ -113,7 +113,7 @@ export default function (argv: ValidateCommitsOptions, logger: logging.Logger) {
     sha = argv.head || 'HEAD';
   } else {
     const parentRemote = process.env['GIT_REMOTE'] ? process.env['GIT_REMOTE'] + '/' : '';
-    const parentBranch = process.env['GIT_BRANCH'] || 'master';
+    const parentBranch = process.env['GIT_BRANCH'] || process.env['CIRCLE_BRANCH'] || 'master';
     baseSha = execSync(`git merge-base --fork-point "${parentRemote}${parentBranch}"`)
       .toString().trim();
     sha = 'HEAD';

From a53e1d69c8f067e972f6bb44d091fb7b94a78a62 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 5 Feb 2021 13:31:31 -0500
Subject: [PATCH 2/2] test(@angular/cli): remove package manager check from npm
 7 E2E

E2E tests on this branch are only run with npm and the used utility functions do not exist.
---
 tests/legacy-cli/e2e/tests/misc/npm-7.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/misc/npm-7.ts b/tests/legacy-cli/e2e/tests/misc/npm-7.ts
index 3d432324f9fc..38c3b4f8e76d 100644
--- a/tests/legacy-cli/e2e/tests/misc/npm-7.ts
+++ b/tests/legacy-cli/e2e/tests/misc/npm-7.ts
@@ -1,15 +1,9 @@
-import { getActivePackageManager } from '../../utils/packages';
 import { ng, npm } from '../../utils/process';
 import { expectToFail } from '../../utils/utils';
 
 const errorText = 'The Angular CLI currently requires npm version 6.';
 
 export default async function() {
-  // Only relevant with npm as a package manager
-  if (getActivePackageManager() !== 'npm') {
-    return;
-  }
-
   // Windows CI fails with permission errors when trying to replace npm
   if (process.platform.startsWith('win')) {
     return;