Skip to content

Commit c65c6cc

Browse files
committed
Test on Node 18
* Replaced outdated `grunt-bg-shell`-package to get rid of coffee-script warnings Backports parts of 785a63e.
1 parent 3d3796c commit c65c6cc

File tree

5 files changed

+110
-39
lines changed

5 files changed

+110
-39
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
matrix:
3434
operating-system: ['ubuntu-latest', 'windows-latest']
3535
# https://nodejs.org/en/about/releases/
36-
node-version: ['10', '12', '14', '16', '17']
36+
node-version: ['10', '12', '14', '16', '18']
3737

3838
steps:
3939
- name: Checkout
@@ -54,7 +54,7 @@ jobs:
5454

5555
- name: Test (Integration)
5656
# https://github.com/webpack/webpack/issues/14532
57-
if: ${{ matrix.node-version != '17' }}
57+
if: ${{ matrix.node-version != '18' }}
5858
run: |
5959
cd ./tests/integration/rollup-test && ./test.sh && cd -
6060
cd ./tests/integration/webpack-babel-test && ./test.sh && cd -

Gruntfile.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,9 @@ module.exports = function(grunt) {
166166
}
167167
},
168168

169-
bgShell: {
169+
shell: {
170170
integrationTests: {
171-
cmd: './tests/integration/run-integration-tests.sh',
172-
bg: false,
173-
fail: true
171+
command: './tests/integration/run-integration-tests.sh'
174172
}
175173
},
176174

@@ -195,7 +193,7 @@ module.exports = function(grunt) {
195193
grunt.loadNpmTasks('grunt-contrib-uglify');
196194
grunt.loadNpmTasks('grunt-contrib-watch');
197195
grunt.loadNpmTasks('grunt-babel');
198-
grunt.loadNpmTasks('grunt-bg-shell');
196+
grunt.loadNpmTasks('grunt-shell');
199197
grunt.loadNpmTasks('grunt-webpack');
200198

201199
grunt.task.loadTasks('tasks');
@@ -214,7 +212,7 @@ module.exports = function(grunt) {
214212
// Requires secret properties from .travis.yaml
215213
grunt.registerTask('extensive-tests-and-publish-to-aws', [
216214
'default',
217-
'bgShell:integrationTests',
215+
'shell:integrationTests',
218216
'metrics',
219217
'publish-to-aws'
220218
]);
@@ -234,6 +232,6 @@ module.exports = function(grunt) {
234232
);
235233
grunt.registerTask('integration-tests', [
236234
'default',
237-
'bgShell:integrationTests'
235+
'shell:integrationTests'
238236
]);
239237
};

package-lock.json

+101-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
"fs-extra": "^8.1.0",
5050
"grunt": "^1.0.4",
5151
"grunt-babel": "^5.0.0",
52-
"grunt-bg-shell": "^2.3.3",
5352
"grunt-cli": "^1",
5453
"grunt-contrib-clean": "^1",
5554
"grunt-contrib-concat": "^1",
@@ -58,6 +57,7 @@
5857
"grunt-contrib-requirejs": "^1",
5958
"grunt-contrib-uglify": "^1",
6059
"grunt-contrib-watch": "^1.1.0",
60+
"grunt-shell": "^4.0.0",
6161
"grunt-webpack": "^1.0.8",
6262
"husky": "^3.1.0",
6363
"jison": "~0.3.0",

tests/integration/multi-nodejs-test/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cd "$( dirname "$( readlink -f "$0" )" )" || exit 1
1414
unset npm_config_prefix
1515

1616
echo "Handlebars should be able to run in various versions of NodeJS"
17-
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
17+
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
1818

1919
rm target node_modules package-lock.json -rf
2020
mkdir target

0 commit comments

Comments
 (0)