Skip to content

Commit

Permalink
chore: exec lint as separate CI step (#1255)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeeyyy authored and WilcoFiers committed Nov 26, 2018
1 parent b1657f8 commit 439b826
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
12 changes: 12 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ jobs:
paths:
- node_modules

# Run ESLINT
lint:
<<: *defaults
steps:
- checkout
- <<: *restore_dependency_cache
- run: npm run eslint

# Run the test suite.
test:
<<: *defaults
Expand Down Expand Up @@ -61,6 +69,10 @@ workflows:
build:
jobs:
- dependencies
# Run linting
- lint:
requires:
- dependencies
# Run tests on all commits, but after installing dependencies
- test:
requires:
Expand Down
13 changes: 1 addition & 12 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-mocha');
grunt.loadNpmTasks('grunt-parallel');
grunt.loadNpmTasks('grunt-run');
grunt.loadTasks('build/tasks');

var langs;
Expand Down Expand Up @@ -338,22 +337,12 @@ module.exports = function(grunt) {
base: ['.']
}
}
},
run: {
npm_run_eslint: {
cmd: 'npm',
args: ['run', 'eslint']
}
}
});

grunt.registerTask('default', ['build']);

grunt.registerTask('pre-build', [
'clean',
'generate-imports',
'run:npm_run_eslint'
]);
grunt.registerTask('pre-build', ['clean', 'generate-imports']);

grunt.registerTask('build', [
'pre-build',
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
"grunt-contrib-watch": "^1.1.0",
"grunt-mocha": "1.1.0",
"grunt-parallel": "^0.5.1",
"grunt-run": "^0.8.1",
"html-entities": "^1.2.0",
"husky": "^1.1.1",
"jquery": "^3.0.0",
Expand Down

0 comments on commit 439b826

Please sign in to comment.