Skip to content

Commit 4e7a454

Browse files
josephperrottatscott
authored andcommitted
style(dev-infra): correct tslint failures in dev-infra directory (angular#37233)
Fixes tslint failures in dev-infra directory as the directory is now part of the tslint enforced files. PR Close angular#37233
1 parent 753fed2 commit 4e7a454

File tree

11 files changed

+35
-15
lines changed

11 files changed

+35
-15
lines changed

dev-infra/benchmark/component_benchmark/protractor-perf.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ exports.config = {
3636
showColors: true,
3737
defaultTimeoutInterval: 90000,
3838
print: function(msg) {
39-
console.log(msg);
39+
console.info(msg);
4040
},
4141
},
4242
useAllAngular2AppRoots: true

dev-infra/benchmark/driver-utilities/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright Google Inc. All Rights Reserved.
3+
* Copyright Google LLC All Rights Reserved.
44
*
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license

dev-infra/pr/discover-new-conflicts/cli.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
19
import {Arguments, Argv} from 'yargs';
210

311
import {error} from '../../utils/console';

dev-infra/pr/merge/cli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export function buildMergeCommand(yargs: Argv) {
1717
return yargs.help().strict().option('github-token', {
1818
type: 'string',
1919
description: 'Github token. If not set, token is retrieved from the environment variables.'
20-
})
20+
});
2121
}
2222

2323
/** Handles the merge command. i.e. performs the merge of a specified pull request. */

dev-infra/pr/merge/config.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export interface MergeRemote {
3838
/** Name of the repository. */
3939
name: string;
4040
/** Whether SSH should be used for merging pull requests. */
41-
useSsh?: boolean
41+
useSsh?: boolean;
4242
}
4343

4444
/**
@@ -87,15 +87,11 @@ export function loadAndValidateConfig(): {config?: MergeConfigWithRemote, errors
8787
const config: Partial<DevInfraMergeConfig> = getConfig();
8888

8989
if (config.merge === undefined) {
90-
return {
91-
errors: ['No merge configuration found. Set the `merge` configuration.']
92-
}
90+
return {errors: ['No merge configuration found. Set the `merge` configuration.']};
9391
}
9492

9593
if (typeof config.merge !== 'function') {
96-
return {
97-
errors: ['Expected merge configuration to be defined lazily through a function.']
98-
}
94+
return {errors: ['Expected merge configuration to be defined lazily through a function.']};
9995
}
10096

10197
const mergeConfig = config.merge();

dev-infra/pr/merge/strategies/api-merge.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export class GithubApiMergeStrategy extends MergeStrategy {
153153
* strategy, we cannot start an interactive rebase because we merge using the Github API.
154154
* The Github API only allows modifications to PR title and body for squash merges.
155155
*/
156-
async _promptCommitMessageEdit(pullRequest: PullRequest, mergeOptions: PullsMergeParams) {
156+
private async _promptCommitMessageEdit(pullRequest: PullRequest, mergeOptions: PullsMergeParams) {
157157
const commitMessage = await this._getDefaultSquashCommitMessage(pullRequest);
158158
const {result} = await prompt<{result: string}>({
159159
type: 'editor',

dev-infra/pr/merge/strategies/autosquash-merge.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
19
import {join} from 'path';
210
import {PullRequestFailure} from '../failures';
311
import {PullRequest} from '../pull-request';

dev-infra/pr/merge/strategies/commit-message-filter.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
#!/usr/bin/env node
2+
/**
3+
* @license
4+
* Copyright Google LLC All Rights Reserved.
5+
*
6+
* Use of this source code is governed by an MIT-style license that can be
7+
* found in the LICENSE file at https://angular.io/license
8+
*/
29

310
/**
411
* Script that can be passed as commit message filter to `git filter-branch --msg-filter`.

dev-infra/ts-circular-dependencies/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface CircularDependenciesTestConfig {
2020
/** Path to the golden file that is used for checking and approving. */
2121
goldenFile: string;
2222
/** Glob that resolves source files which should be checked. */
23-
glob: string
23+
glob: string;
2424
/**
2525
* Optional module resolver function that can be used to resolve modules
2626
* to absolute file paths.

dev-infra/utils/github.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const graphql = unauthenticatedGraphql.defaults({
2828

2929
/** Get a PR from github */
3030
export async function getPr<PrSchema>(
31-
prSchema: PrSchema, number: number, {owner, name}: GithubConfig) {
31+
prSchema: PrSchema, prNumber: number, {owner, name}: GithubConfig) {
3232
const PR_QUERY = params(
3333
{
3434
$number: 'Int!', // The PR number
@@ -41,7 +41,8 @@ export async function getPr<PrSchema>(
4141
})
4242
});
4343

44-
const result = await graphql(graphqlQuery(PR_QUERY), {number, owner, name}) as typeof PR_QUERY;
44+
const result =
45+
await graphql(graphqlQuery(PR_QUERY), {number: prNumber, owner, name}) as typeof PR_QUERY;
4546
return result.repository.pullRequest;
4647
}
4748

0 commit comments

Comments
 (0)