diff --git a/azure-pipelines-linux-mac.yml b/azure-pipelines-linux-mac.yml index 1d3d91f112..dc2f3380f0 100644 --- a/azure-pipelines-linux-mac.yml +++ b/azure-pipelines-linux-mac.yml @@ -46,7 +46,7 @@ steps: GITHUB_TOKEN: $(GITHUB_TOKEN) - script: | - yarn gulp hygiene + yarn gulp hygiene --skip-tslint displayName: Run Hygiene Checks - script: | diff --git a/azure-pipelines-windows.yml b/azure-pipelines-windows.yml index b2252846cf..4f57abb46f 100644 --- a/azure-pipelines-windows.yml +++ b/azure-pipelines-windows.yml @@ -34,7 +34,7 @@ steps: GITHUB_TOKEN: $(GITHUB_TOKEN) - script: | - yarn gulp hygiene + yarn gulp hygiene --skip-tslint displayName: Run Hygiene Checks - script: | diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js index 9da2f955be..a919677467 100644 --- a/build/gulpfile.hygiene.js +++ b/build/gulpfile.hygiene.js @@ -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