Readd sql linting (#7217)

* readd sql linting

* add skip linting for pipeline hygiene
This commit is contained in:
Anthony Dresser
2019-09-16 10:59:28 -07:00
committed by GitHub
parent bae797f975
commit 075479274d
3 changed files with 14 additions and 11 deletions

View File

@@ -46,7 +46,7 @@ steps:
GITHUB_TOKEN: $(GITHUB_TOKEN)
- script: |
yarn gulp hygiene
yarn gulp hygiene --skip-tslint
displayName: Run Hygiene Checks
- script: |

View File

@@ -34,7 +34,7 @@ steps:
GITHUB_TOKEN: $(GITHUB_TOKEN)
- script: |
yarn gulp hygiene
yarn gulp hygiene --skip-tslint
displayName: Run Hygiene Checks
- script: |

View File

@@ -198,9 +198,9 @@ const tslintBaseFilter = [
// 'src/**'
// ];
// const sqlFilter = [
// 'src/sql/**'
// ];
const sqlFilter = [
'src/sql/**'
];
// {{SQL CARBON EDIT}}
@@ -401,16 +401,16 @@ function hygiene(some) {
input = some;
}
// const tslintSqlConfiguration = tslint.Configuration.findConfiguration('tslint-sql.json', '.'); // TODO RESTORE
const tslintSqlConfiguration = tslint.Configuration.findConfiguration('tslint-sql.json', '.');
const tslintSqlOptions = { fix: false, formatter: 'json' };
const sqlTsLinter = new tslint.Linter(tslintSqlOptions);
// const sqlTsl = es.through(function (file) { //TODO restore
// const contents = file.contents.toString('utf8');
// sqlTsLinter.lint(file.relative, contents, tslintSqlConfiguration.results);
const sqlTsl = es.through(function (file) { //TODO restore
const contents = file.contents.toString('utf8');
sqlTsLinter.lint(file.relative, contents, tslintSqlConfiguration.results);
// this.emit('data', file);
// });
this.emit('data', file);
});
const productJsonFilter = filter('product.json', { restore: true });
@@ -430,6 +430,9 @@ function hygiene(some) {
if (!process.argv.some(arg => arg === '--skip-tslint')) {
typescript = typescript.pipe(tsl);
typescript = typescript
.pipe(filter(sqlFilter))
.pipe(sqlTsl); // {{SQL CARBON EDIT}}
}
const javascript = result