diff options
author | murgatroid99 <mlumish@google.com> | 2016-02-04 13:44:41 -0800 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2016-02-04 13:44:41 -0800 |
commit | 53f16356b2820d795bdf1ab0e32e454c6b0ce3a9 (patch) | |
tree | 647fc41f8a250775c86c3619345e4a722fc43167 /tools/run_tests/build_package_node.sh | |
parent | b781c9757dd95e416a649d21fdc8858f67ecefd2 (diff) | |
parent | e4fdcd924263edca885b22122e9e7cf148c236fd (diff) |
Resolved merge conflict with master
Diffstat (limited to 'tools/run_tests/build_package_node.sh')
-rwxr-xr-x[-rw-r--r--] | tools/run_tests/build_package_node.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/run_tests/build_package_node.sh b/tools/run_tests/build_package_node.sh index 137d914cb3..1358740264 100644..100755 --- a/tools/run_tests/build_package_node.sh +++ b/tools/run_tests/build_package_node.sh @@ -32,6 +32,7 @@ set -ex cd $(dirname $0)/../.. +mkdir -p artifacts/ cp -r $EXTERNAL_GIT_ROOT/architecture={x86,x64},language=node,platform={windows,linux,macos}/artifacts/* artifacts/ || true npm pack |