Skip to content

Commit

Permalink
update workflow cfg and tasks in sync with v4
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaspark committed Jan 22, 2021
1 parent 81ffe02 commit edc15a9
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: CI

on: [push, pull_request]

env:
CI: true
NODE: 14.x

jobs:
Expand All @@ -13,7 +14,7 @@ jobs:
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: "${{ env.NODE }}"

Expand All @@ -23,8 +24,8 @@ jobs:
path: ~/.npm
key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
${{ runner.OS }}-node-v${{ env.NODE }}-
${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
${{ runner.os }}-node-v${{ env.NODE }}-
- run: java -version

Expand All @@ -34,6 +35,9 @@ jobs:
- name: Build the files
run: npm run build

- name: Build the docs files
run: npm run docs

- name: Run tests
run: npm test

Expand Down
2 changes: 2 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ module.exports = grunt => {
grunt.registerTask('vendor', 'copy:vendor');

grunt.registerTask('docs-css', ['sass:docs', 'postcss:docs']);
grunt.registerTask('docs', ['docs-css', 'vendor']);
grunt.registerTask('release', ['swatch', 'docs']);

grunt.registerTask('server', 'connect:keepalive');

Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
},
"scripts": {
"build": "grunt swatch",
"docs": "grunt docs",
"htmllint": "grunt htmllint",
"stylelint": "stylelint \"**/*.scss\" --rd",
"release": "grunt release",
"test": "npm run stylelint"
},
"files": [
Expand All @@ -24,7 +26,7 @@
"dependencies": {},
"devDependencies": {
"@lodder/grunt-postcss": "^3.0.0",
"autoprefixer": "^10.1.0",
"autoprefixer": "^10.2.3",
"bootstrap": "^5.0.0-beta1",
"font-awesome": "^4.7.0",
"grunt": "^1.3.0",
Expand All @@ -34,12 +36,12 @@
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^3.0.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-html": "^14.2.0",
"grunt-html": "^14.2.1",
"grunt-sass": "^3.1.0",
"jquery": "^3.5.1",
"node-sass": "^5.0.0",
"postcss": "^8.2.0",
"stylelint": "^13.8.0",
"postcss": "^8.2.4",
"stylelint": "^13.9.0",
"stylelint-config-twbs-bootstrap": "^2.1.0"
}
}

0 comments on commit edc15a9

Please sign in to comment.