Permalink
Browse files

meta: merge node/master into node-chakracore/master

Merge 8aca934 as of 2018-09-23
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Jack Horton (CHAKRA) <jahorto@microsoft.com>
  • Loading branch information...
chakrabot committed Sep 25, 2018
2 parents 829dce9 + 8aca934 commit 211fb17422ba9a7134be140e247169eb2991ab22
Showing 1,624 changed files with 52,471 additions and 73,501 deletions.
View
@@ -8,10 +8,8 @@ matrix:
include:
- name: "Linter"
node_js: "latest"
env:
env:
- NODE=$(which node)
install:
- make lint-md-build
script:
- make lint
- name: "Test Suite"
View
@@ -31,7 +31,7 @@
# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.12',
'v8_embedder_string': '-node.2',
# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
@@ -8,10 +8,10 @@
// These macros define the version number for the current version.
// NOTE these macros are used by some of the tool scripts and the build
// system so their names cannot be changed without changing the scripts.
#define V8_MAJOR_VERSION 6
#define V8_MINOR_VERSION 9
#define V8_BUILD_NUMBER 427
#define V8_PATCH_LEVEL 23
#define V8_MAJOR_VERSION 7
#define V8_MINOR_VERSION 0
#define V8_BUILD_NUMBER 276
#define V8_PATCH_LEVEL 20
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
View
@@ -36,6 +36,7 @@
/_*
/build
/buildtools
/check-header-includes
/hydrogen.cfg
/obj
/out
@@ -68,6 +69,7 @@
!/third_party/googletest/src/googletest/include/gtest
/third_party/googletest/src/googletest/include/gtest/*
!/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
!/third_party/v8
/tools/clang
/tools/gcmole/gcmole-tools
/tools/gcmole/gcmole-tools.tar.gz
View
@@ -1,7 +1,7 @@
# This is a vpython "spec" file.
#
# It describes patterns for python wheel dependencies of the python scripts in
# the chromium repo, particularly for dependencies that have compiled components
# the V8 repo, particularly for dependencies that have compiled components
# (since pure-python dependencies can be easily vendored into third_party).
#
# When vpython is invoked, it finds this file and builds a python VirtualEnv,
View
@@ -17,6 +17,7 @@ Opera Software ASA <*@opera.com>
Intel Corporation <*@intel.com>
MIPS Technologies, Inc. <*@mips.com>
Imagination Technologies, LLC <*@imgtec.com>
Wave Computing, Inc. <*@wavecomp.com>
Loongson Technology Corporation Limited <*@loongson.cn>
Code Aurora Forum <*@codeaurora.org>
Home Jinni Inc. <*@homejinni.com>
@@ -100,6 +101,7 @@ Kang-Hao (Kenny) Lu <kennyluck@csail.mit.edu>
Karl Skomski <karl@skomski.com>
Kevin Gibbons <bakkot@gmail.com>
Kris Selden <kris.selden@gmail.com>
Kyounga Ra <kyounga@alticast.com>
Loo Rong Jie <loorongjie@gmail.com>
Luis Reis <luis.m.reis@gmail.com>
Luke Zarko <lukezarko@gmail.com>
Oops, something went wrong.

0 comments on commit 211fb17

Please sign in to comment.