Skip to content

CI fixes for 9.1.x/10.2.x #19988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clydin merged 2 commits into from
Feb 5, 2021
Merged

CI fixes for 9.1.x/10.2.x #19988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
258d178
ci: check CIRCLE_BRANCH when validating commits
clydin Feb 5, 2021
a53e1d6
test(@angular/cli): remove package manager check from npm 7 E2E
clydin Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/validate-commits.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 0 additions & 6 deletions tests/legacy-cli/e2e/tests/misc/npm-7.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down