Skip to content

Commit

Permalink
Test on Node 18
Browse files Browse the repository at this point in the history
* Replaced outdated `grunt-bg-shell`-package to get rid of
  coffee-script warnings

Backports parts of 785a63e.
  • Loading branch information
jaylinski committed Oct 21, 2022
1 parent 3d3796c commit c65c6cc
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 39 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
matrix:
operating-system: ['ubuntu-latest', 'windows-latest']
# https://nodejs.org/en/about/releases/
node-version: ['10', '12', '14', '16', '17']
node-version: ['10', '12', '14', '16', '18']

steps:
- name: Checkout
Expand All @@ -54,7 +54,7 @@ jobs:

- name: Test (Integration)
# https://github.com/webpack/webpack/issues/14532
if: ${{ matrix.node-version != '17' }}
if: ${{ matrix.node-version != '18' }}
run: |
cd ./tests/integration/rollup-test && ./test.sh && cd -
cd ./tests/integration/webpack-babel-test && ./test.sh && cd -
Expand Down
12 changes: 5 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,9 @@ module.exports = function(grunt) {
}
},

bgShell: {
shell: {
integrationTests: {
cmd: './tests/integration/run-integration-tests.sh',
bg: false,
fail: true
command: './tests/integration/run-integration-tests.sh'
}
},

Expand All @@ -195,7 +193,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-babel');
grunt.loadNpmTasks('grunt-bg-shell');
grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-webpack');

grunt.task.loadTasks('tasks');
Expand All @@ -214,7 +212,7 @@ module.exports = function(grunt) {
// Requires secret properties from .travis.yaml
grunt.registerTask('extensive-tests-and-publish-to-aws', [
'default',
'bgShell:integrationTests',
'shell:integrationTests',
'metrics',
'publish-to-aws'
]);
Expand All @@ -234,6 +232,6 @@ module.exports = function(grunt) {
);
grunt.registerTask('integration-tests', [
'default',
'bgShell:integrationTests'
'shell:integrationTests'
]);
};
129 changes: 101 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"fs-extra": "^8.1.0",
"grunt": "^1.0.4",
"grunt-babel": "^5.0.0",
"grunt-bg-shell": "^2.3.3",
"grunt-cli": "^1",
"grunt-contrib-clean": "^1",
"grunt-contrib-concat": "^1",
Expand All @@ -58,6 +57,7 @@
"grunt-contrib-requirejs": "^1",
"grunt-contrib-uglify": "^1",
"grunt-contrib-watch": "^1.1.0",
"grunt-shell": "^4.0.0",
"grunt-webpack": "^1.0.8",
"husky": "^3.1.0",
"jison": "~0.3.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/multi-nodejs-test/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cd "$( dirname "$( readlink -f "$0" )" )" || exit 1
unset npm_config_prefix

echo "Handlebars should be able to run in various versions of NodeJS"
for node_version_to_test in 0.10 0.12 4 5 6 7 8 9 10 11 12 13 14 15 16 17; do
for node_version_to_test in 0.10 0.12 4 5 6 7 8 9 10 11 12 13 14 15 16 18; do

rm target node_modules package-lock.json -rf
mkdir target
Expand Down

0 comments on commit c65c6cc

Please sign in to comment.