Skip to content

Commit

Permalink
updated all dependencies possible and switched to node v16.13.2 for l…
Browse files Browse the repository at this point in the history
…ocal builds
  • Loading branch information
jamesdbloom committed Jan 19, 2022
1 parent 4d79cd6 commit 8789fb5
Show file tree
Hide file tree
Showing 7 changed files with 11,098 additions and 2,934 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ steps:
- wait

- label: "build"
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"
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"
13,985 changes: 11,067 additions & 2,918 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"engines": {
"node": ">= 0.8.0"
},
"main": "launch_and_set_expectations.js",
"scripts": {
"test": "grunt"
},
Expand All @@ -33,21 +32,21 @@
"stop_MockServer.sh"
],
"devDependencies": {
"grunt": "^1.0.3",
"grunt-contrib-clean": "~2.0",
"grunt-contrib-jshint": "~3.1",
"grunt-contrib-nodeunit": "~4.0",
"grunt-exec": "~3.0",
"nodeunit": "^0.11.3"
"grunt": "~1.4.1",
"grunt-contrib-clean": "~2.0.0",
"grunt-contrib-jshint": "~3.1.1",
"grunt-contrib-nodeunit": "~4.0.0",
"grunt-exec": "~3.0.0",
"nodeunit": "~0.11.3"
},
"keywords": [
"mockserver",
"gruntplugin",
"grunt"
],
"dependencies": {
"follow-redirects": "~1.14",
"glob": "^7.1.5",
"q": "~2.0"
"follow-redirects": "~1.14.7",
"glob": "~7.2.0",
"q": "~2.0.2"
}
}
10 changes: 10 additions & 0 deletions scripts/buildkite_quick_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# install project npm modules

npm cache verify
npm install --no-optional

# run project build

grunt headless
4 changes: 4 additions & 0 deletions scripts/local_buildkite_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash

docker pull mockserver/mockserver:grunt
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
10 changes: 5 additions & 5 deletions scripts/local_quick_build.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env bash

function finish {
dmesg | grep -E -i -B100 'killed process'
}
trap finish ERR
nvm use v16.13.2

# install project npm modules

npm install
npm install grunt --global
npm cache verify
npm install --no-optional
npm audit fix

# run project build

Expand Down
2 changes: 2 additions & 0 deletions test/grunt/failure/mock_server_failure_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
'should fail start if configuration missing': function (test) {
test.expect(1);
exec('../../../node_modules/.bin/grunt start_mockserver:missing_ports', execOptions, function (error, stdout, stderr) {
stderr = stderr.replace(/\(node:\d*\) ExperimentalWarning: queueMicrotask\(\) is experimental\.\n/, '');
test.equal(
stderr,
"Please specify \"serverPort\", for example: \"start_mockserver({ serverPort: 1080 })\"\n" +
Expand All @@ -32,6 +33,7 @@
'should fail stop if configuration missing': function (test) {
test.expect(1);
exec('../../../node_modules/.bin/grunt stop_mockserver:missing_ports', execOptions, function (error, stdout, stderr) {
stderr = stderr.replace(/\(node:\d*\) ExperimentalWarning: queueMicrotask\(\) is experimental\.\n/, '');
test.equal(
stderr,
"Please specify \"serverPort\", for example: \"stop_mockserver({ serverPort: 1080 })\"\n" +
Expand Down

0 comments on commit 8789fb5

Please sign in to comment.