Skip to content

Commit 8789fb5

Browse files
committed
updated all dependencies possible and switched to node v16.13.2 for local builds
1 parent 4d79cd6 commit 8789fb5

File tree

7 files changed

+11098
-2934
lines changed

7 files changed

+11098
-2934
lines changed

.buildkite/pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ steps:
55
- wait
66

77
- label: "build"
8-
command: "docker run -v /var/lib/buildkite-agent/builds/$BUILDKITE_AGENT_NAME/mockserver:/build -w /build/mockserver-node -a stdout -a stderr mockserver/mockserver:grunt /build/mockserver-node/scripts/local_quick_build.sh"
8+
command: "docker run -v $(pwd):/build/mockserver-node -w /build/mockserver-node -a stdout -a stderr -e BUILDKITE_BRANCH=$BUILDKITE_BRANCH mockserver/mockserver:grunt /build/mockserver-node/scripts/buildkite_quick_build.sh"

package-lock.json

+11,067-2,918
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"engines": {
2020
"node": ">= 0.8.0"
2121
},
22-
"main": "launch_and_set_expectations.js",
2322
"scripts": {
2423
"test": "grunt"
2524
},
@@ -33,21 +32,21 @@
3332
"stop_MockServer.sh"
3433
],
3534
"devDependencies": {
36-
"grunt": "^1.0.3",
37-
"grunt-contrib-clean": "~2.0",
38-
"grunt-contrib-jshint": "~3.1",
39-
"grunt-contrib-nodeunit": "~4.0",
40-
"grunt-exec": "~3.0",
41-
"nodeunit": "^0.11.3"
35+
"grunt": "~1.4.1",
36+
"grunt-contrib-clean": "~2.0.0",
37+
"grunt-contrib-jshint": "~3.1.1",
38+
"grunt-contrib-nodeunit": "~4.0.0",
39+
"grunt-exec": "~3.0.0",
40+
"nodeunit": "~0.11.3"
4241
},
4342
"keywords": [
4443
"mockserver",
4544
"gruntplugin",
4645
"grunt"
4746
],
4847
"dependencies": {
49-
"follow-redirects": "~1.14",
50-
"glob": "^7.1.5",
51-
"q": "~2.0"
48+
"follow-redirects": "~1.14.7",
49+
"glob": "~7.2.0",
50+
"q": "~2.0.2"
5251
}
5352
}

scripts/buildkite_quick_build.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
# install project npm modules
4+
5+
npm cache verify
6+
npm install --no-optional
7+
8+
# run project build
9+
10+
grunt headless

scripts/local_buildkite_build.sh

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
3+
docker pull mockserver/mockserver:grunt
4+
docker run -v $(pwd):/build/mockserver-client-node -w /build/mockserver-client-node -a stdout -a stderr -e BUILDKITE_BRANCH=$BUILDKITE_BRANCH mockserver/mockserver:grunt /build/mockserver-client-node/scripts/buildkite_quick_build.sh

scripts/local_quick_build.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/usr/bin/env bash
22

3-
function finish {
4-
dmesg | grep -E -i -B100 'killed process'
5-
}
6-
trap finish ERR
3+
nvm use v16.13.2
74

85
# install project npm modules
96

10-
npm install
7+
npm install grunt --global
8+
npm cache verify
9+
npm install --no-optional
10+
npm audit fix
1111

1212
# run project build
1313

test/grunt/failure/mock_server_failure_test.js

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'should fail start if configuration missing': function (test) {
1515
test.expect(1);
1616
exec('../../../node_modules/.bin/grunt start_mockserver:missing_ports', execOptions, function (error, stdout, stderr) {
17+
stderr = stderr.replace(/\(node:\d*\) ExperimentalWarning: queueMicrotask\(\) is experimental\.\n/, '');
1718
test.equal(
1819
stderr,
1920
"Please specify \"serverPort\", for example: \"start_mockserver({ serverPort: 1080 })\"\n" +
@@ -32,6 +33,7 @@
3233
'should fail stop if configuration missing': function (test) {
3334
test.expect(1);
3435
exec('../../../node_modules/.bin/grunt stop_mockserver:missing_ports', execOptions, function (error, stdout, stderr) {
36+
stderr = stderr.replace(/\(node:\d*\) ExperimentalWarning: queueMicrotask\(\) is experimental\.\n/, '');
3537
test.equal(
3638
stderr,
3739
"Please specify \"serverPort\", for example: \"stop_mockserver({ serverPort: 1080 })\"\n" +

0 commit comments

Comments
 (0)