Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/316769
Change subject: Update citoid to 047ac7d
......................................................................
Update citoid to 047ac7d
List of changes:
047ac7d Prod: Switch to Node v4.6.0
xxxxxxx Update node module dependencies
Change-Id: I4f592d4ce21c05c72feb860bcded24b42c0d808b
---
M node_modules/heapdump/build/Makefile
M
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/buffer-shims/package.json
M src
7 files changed, 59 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid/deploy
refs/changes/69/316769/1
diff --git a/node_modules/heapdump/build/Makefile
b/node_modules/heapdump/build/Makefile
index 71b2b2b..c9d9d51 100644
--- a/node_modules/heapdump/build/Makefile
+++ b/node_modules/heapdump/build/Makefile
@@ -57,7 +57,7 @@
CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
CXX.host ?= g++
CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
-LINK.host ?= $(CXX.host)
+LINK.host ?= g++
LDFLAGS.host ?=
AR.host ?= ar
@@ -308,8 +308,8 @@
endif
quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir);
/usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
-fmake --ignore-environment "--toplevel-dir=."
-I/opt/service/node_modules/heapdump/build/config.gypi
-I/usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
-I/home/runuser/.node-gyp/4.4.6/include/node/common.gypi "--depth=."
"-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library"
"-Dvisibility=default" "-Dnode_root_dir=/home/runuser/.node-gyp/4.4.6"
"-Dnode_gyp_dir=/usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp"
"-Dnode_lib_file=node.lib"
"-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp
-Makefile:
$(srcdir)/../../../../usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
$(srcdir)/build/config.gypi $(srcdir)/binding.gyp
$(srcdir)/../../../../home/runuser/.node-gyp/4.4.6/include/node/common.gypi
+cmd_regen_makefile = cd $(srcdir);
/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
-fmake --ignore-environment "--toplevel-dir=."
-I/opt/service/node_modules/heapdump/build/config.gypi
-I/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
-I/home/runuser/.node-gyp/4.6.0/include/node/common.gypi "--depth=."
"-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library"
"-Dvisibility=default" "-Dnode_root_dir=/home/runuser/.node-gyp/4.6.0"
"-Dnode_gyp_dir=/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp"
"-Dnode_lib_file=node.lib"
"-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp
+Makefile:
$(srcdir)/../../../../home/runuser/.node-gyp/4.6.0/include/node/common.gypi
$(srcdir)/../../../../usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
$(srcdir)/build/config.gypi $(srcdir)/binding.gyp
$(call do_cmd,regen_makefile)
# "all" is a concatenation of the "all" targets from all the included
diff --git
a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
index c044ce4..9af41a7 100644
---
a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
+++
b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
@@ -1,36 +1,36 @@
-cmd_Release/obj.target/addon/src/heapdump.o := g++
'-DNODE_GYP_MODULE_NAME=addon' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64'
'-DBUILDING_NODE_EXTENSION' -I/home/runuser/.node-gyp/4.4.6/include/node
-I/home/runuser/.node-gyp/4.4.6/src
-I/home/runuser/.node-gyp/4.4.6/deps/uv/include
-I/home/runuser/.node-gyp/4.4.6/deps/v8/include -fPIC -pthread -Wall -Wextra
-Wno-unused-parameter -m64 -O3 -ffunction-sections -fdata-sections
-fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF
./Release/.deps/Release/obj.target/addon/src/heapdump.o.d.raw -c -o
Release/obj.target/addon/src/heapdump.o ../src/heapdump.cc
+cmd_Release/obj.target/addon/src/heapdump.o := g++
'-DNODE_GYP_MODULE_NAME=addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1'
'-DV8_DEPRECATION_WARNINGS=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64'
'-DBUILDING_NODE_EXTENSION' -I/home/runuser/.node-gyp/4.6.0/include/node
-I/home/runuser/.node-gyp/4.6.0/src
-I/home/runuser/.node-gyp/4.6.0/deps/uv/include
-I/home/runuser/.node-gyp/4.6.0/deps/v8/include -fPIC -pthread -Wall -Wextra
-Wno-unused-parameter -m64 -O3 -ffunction-sections -fdata-sections
-fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF
./Release/.deps/Release/obj.target/addon/src/heapdump.o.d.raw -c -o
Release/obj.target/addon/src/heapdump.o ../src/heapdump.cc
Release/obj.target/addon/src/heapdump.o: ../src/heapdump.cc \
- /home/runuser/.node-gyp/4.4.6/include/node/node.h \
- /home/runuser/.node-gyp/4.4.6/include/node/v8.h \
- /home/runuser/.node-gyp/4.4.6/include/node/v8-version.h \
- /home/runuser/.node-gyp/4.4.6/include/node/v8config.h \
- /home/runuser/.node-gyp/4.4.6/include/node/node_version.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/node.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/v8.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/v8-version.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/v8config.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/node_version.h \
../src/compat-inl.h ../src/compat.h \
- /home/runuser/.node-gyp/4.4.6/include/node/node_version.h \
- /home/runuser/.node-gyp/4.4.6/include/node/v8.h \
- /home/runuser/.node-gyp/4.4.6/include/node/v8-profiler.h \
- /home/runuser/.node-gyp/4.4.6/include/node/uv.h \
- /home/runuser/.node-gyp/4.4.6/include/node/uv-errno.h \
- /home/runuser/.node-gyp/4.4.6/include/node/uv-version.h \
- /home/runuser/.node-gyp/4.4.6/include/node/uv-unix.h \
- /home/runuser/.node-gyp/4.4.6/include/node/uv-threadpool.h \
- /home/runuser/.node-gyp/4.4.6/include/node/uv-linux.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/node_version.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/v8.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/v8-profiler.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/uv.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/uv-errno.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/uv-version.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/uv-unix.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/uv-threadpool.h \
+ /home/runuser/.node-gyp/4.6.0/include/node/uv-linux.h \
../src/heapdump-posix.h
../src/heapdump.cc:
-/home/runuser/.node-gyp/4.4.6/include/node/node.h:
-/home/runuser/.node-gyp/4.4.6/include/node/v8.h:
-/home/runuser/.node-gyp/4.4.6/include/node/v8-version.h:
-/home/runuser/.node-gyp/4.4.6/include/node/v8config.h:
-/home/runuser/.node-gyp/4.4.6/include/node/node_version.h:
+/home/runuser/.node-gyp/4.6.0/include/node/node.h:
+/home/runuser/.node-gyp/4.6.0/include/node/v8.h:
+/home/runuser/.node-gyp/4.6.0/include/node/v8-version.h:
+/home/runuser/.node-gyp/4.6.0/include/node/v8config.h:
+/home/runuser/.node-gyp/4.6.0/include/node/node_version.h:
../src/compat-inl.h:
../src/compat.h:
-/home/runuser/.node-gyp/4.4.6/include/node/node_version.h:
-/home/runuser/.node-gyp/4.4.6/include/node/v8.h:
-/home/runuser/.node-gyp/4.4.6/include/node/v8-profiler.h:
-/home/runuser/.node-gyp/4.4.6/include/node/uv.h:
-/home/runuser/.node-gyp/4.4.6/include/node/uv-errno.h:
-/home/runuser/.node-gyp/4.4.6/include/node/uv-version.h:
-/home/runuser/.node-gyp/4.4.6/include/node/uv-unix.h:
-/home/runuser/.node-gyp/4.4.6/include/node/uv-threadpool.h:
-/home/runuser/.node-gyp/4.4.6/include/node/uv-linux.h:
+/home/runuser/.node-gyp/4.6.0/include/node/node_version.h:
+/home/runuser/.node-gyp/4.6.0/include/node/v8.h:
+/home/runuser/.node-gyp/4.6.0/include/node/v8-profiler.h:
+/home/runuser/.node-gyp/4.6.0/include/node/uv.h:
+/home/runuser/.node-gyp/4.6.0/include/node/uv-errno.h:
+/home/runuser/.node-gyp/4.6.0/include/node/uv-version.h:
+/home/runuser/.node-gyp/4.6.0/include/node/uv-unix.h:
+/home/runuser/.node-gyp/4.6.0/include/node/uv-threadpool.h:
+/home/runuser/.node-gyp/4.6.0/include/node/uv-linux.h:
../src/heapdump-posix.h:
diff --git a/node_modules/heapdump/build/addon.target.mk
b/node_modules/heapdump/build/addon.target.mk
index 1368a66..8f21dcd 100644
--- a/node_modules/heapdump/build/addon.target.mk
+++ b/node_modules/heapdump/build/addon.target.mk
@@ -4,6 +4,9 @@
TARGET := addon
DEFS_Debug := \
'-DNODE_GYP_MODULE_NAME=addon' \
+ '-DUSING_UV_SHARED=1' \
+ '-DUSING_V8_SHARED=1' \
+ '-DV8_DEPRECATION_WARNINGS=1' \
'-D_LARGEFILE_SOURCE' \
'-D_FILE_OFFSET_BITS=64' \
'-DBUILDING_NODE_EXTENSION' \
@@ -31,13 +34,16 @@
-std=gnu++0x
INCS_Debug := \
- -I/home/runuser/.node-gyp/4.4.6/include/node \
- -I/home/runuser/.node-gyp/4.4.6/src \
- -I/home/runuser/.node-gyp/4.4.6/deps/uv/include \
- -I/home/runuser/.node-gyp/4.4.6/deps/v8/include
+ -I/home/runuser/.node-gyp/4.6.0/include/node \
+ -I/home/runuser/.node-gyp/4.6.0/src \
+ -I/home/runuser/.node-gyp/4.6.0/deps/uv/include \
+ -I/home/runuser/.node-gyp/4.6.0/deps/v8/include
DEFS_Release := \
'-DNODE_GYP_MODULE_NAME=addon' \
+ '-DUSING_UV_SHARED=1' \
+ '-DUSING_V8_SHARED=1' \
+ '-DV8_DEPRECATION_WARNINGS=1' \
'-D_LARGEFILE_SOURCE' \
'-D_FILE_OFFSET_BITS=64' \
'-DBUILDING_NODE_EXTENSION'
@@ -65,10 +71,10 @@
-std=gnu++0x
INCS_Release := \
- -I/home/runuser/.node-gyp/4.4.6/include/node \
- -I/home/runuser/.node-gyp/4.4.6/src \
- -I/home/runuser/.node-gyp/4.4.6/deps/uv/include \
- -I/home/runuser/.node-gyp/4.4.6/deps/v8/include
+ -I/home/runuser/.node-gyp/4.6.0/include/node \
+ -I/home/runuser/.node-gyp/4.6.0/src \
+ -I/home/runuser/.node-gyp/4.6.0/deps/uv/include \
+ -I/home/runuser/.node-gyp/4.6.0/deps/v8/include
OBJS := \
$(obj).target/$(TARGET)/src/heapdump.o
diff --git a/node_modules/heapdump/build/config.gypi
b/node_modules/heapdump/build/config.gypi
index 2182d3f..fd4c1dc 100644
--- a/node_modules/heapdump/build/config.gypi
+++ b/node_modules/heapdump/build/config.gypi
@@ -20,6 +20,7 @@
"icu_small": "true",
"icu_ver_major": "56",
"node_byteorder": "little",
+ "node_enable_v8_vtunejit": "false",
"node_install_npm": "true",
"node_prefix": "/",
"node_release_urlbase": "https://nodejs.org/download/release/";,
@@ -45,12 +46,12 @@
"v8_random_seed": 0,
"v8_use_snapshot": "true",
"want_separate_host_toolset": 0,
- "nodedir": "/home/runuser/.node-gyp/4.4.6",
+ "nodedir": "/home/runuser/.node-gyp/4.6.0",
"copy_dev_lib": "true",
"standalone_static_library": 1,
"cache_lock_stale": "60000",
"sign_git_tag": "",
- "user_agent": "npm/2.15.5 node/v4.4.6 linux x64",
+ "user_agent": "npm/2.15.9 node/v4.6.0 linux x64",
"always_auth": "",
"bin_links": "true",
"key": "",
@@ -80,7 +81,7 @@
"rebuild_bundle": "true",
"save_bundle": "",
"shell": "bash",
- "prefix": "/usr/local/nvm/versions/node/v4.4.6",
+ "prefix": "/usr/local/nvm/versions/node/v4.6.0",
"browser": "",
"cache_lock_wait": "10000",
"registry": "https://registry.npmjs.org/";,
@@ -110,7 +111,7 @@
"long": "",
"production": "",
"unsafe_perm": "true",
- "node_version": "4.4.6",
+ "node_version": "4.6.0",
"tag": "latest",
"git_tag_version": "true",
"shrinkwrap": "true",
@@ -120,10 +121,10 @@
"save_exact": "",
"strict_ssl": "true",
"dev": "",
- "globalconfig": "/usr/local/nvm/versions/node/v4.4.6/etc/npmrc",
+ "globalconfig": "/usr/local/nvm/versions/node/v4.6.0/etc/npmrc",
"init_module": "/home/runuser/.npm-init.js",
"parseable": "",
- "globalignorefile": "/usr/local/nvm/versions/node/v4.4.6/etc/npmignore",
+ "globalignorefile": "/usr/local/nvm/versions/node/v4.6.0/etc/npmignore",
"cache_lock_retries": "10",
"save_prefix": "^",
"group": "1000",
diff --git
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
index 12af729..e9d213c 100644
---
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
+++
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
@@ -75,7 +75,7 @@
},
"homepage": "https://github.com/kadtools/kad#readme";,
"_id": "kad@1.3.6",
- "_shasum": "13d023ed6fa3f99979d000d594e1c3a4bd3907b5",
+ "_shasum": "1b4e707959ecb1f44618a33003f84abc35cdb30d",
"_from": "git+https://github.com/gwicke/kad.git#master";,
"_resolved":
"git+https://github.com/gwicke/kad.git#f35971036f43814043245da82b12d035b7bbfd16";
}
diff --git
a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/buffer-shims/package.json
b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/buffer-shims/package.json
index 63307f6..fe079c9 100644
---
a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/buffer-shims/package.json
+++
b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/buffer-shims/package.json
@@ -15,7 +15,7 @@
},
"repository": {
"type": "git",
- "url": "g...@github.com:calvinmetcalf/buffer-shims.git"
+ "url": "git+ssh://g...@github.com/calvinmetcalf/buffer-shims.git"
},
"gitHead": "ea89b3857ab5b8203957922a84e9a48cf4c47e0a",
"bugs": {
@@ -45,5 +45,7 @@
"tmp": "tmp/buffer-shims-1.0.0.tgz_1462560889323_0.8640750856138766"
},
"directories": {},
- "_resolved":
"https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+ "_resolved":
"https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";,
+ "readme": "ERROR: No README data found!",
+ "homepage": "https://github.com/calvinmetcalf/buffer-shims#readme";
}
diff --git a/src b/src
index 26a4661..047ac7d 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 26a4661b7bde716600a5e9daac54a3182cf6c856
+Subproject commit 047ac7db4519d8f95d3cf6a3ca0fcc23b2537ce8
--
To view, visit https://gerrit.wikimedia.org/r/316769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f592d4ce21c05c72feb860bcded24b42c0d808b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
