From eab377f6817e2c9967a2ee8529bc4421d0f6181e Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Thu, 16 Aug 2018 01:27:02 +0800 Subject: [PATCH] deps: fix CRLF in text file not present in upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `deps/v8/third_party/jinja2/LICENSE` is not in upstream v8, and contains CRLF, which is in conflict with `deps/v8/.gitattributes` which sets all text files to use LF. This has caused failures in CI workers with older versions of Git. This patch manually fixes up the file to use LF to resolve the conflict. The file has already been fixed in upstream jinja2, which is pull into our repo when we update V8 so it should be fixed the next time we update V8. PR-URL: https://github.com/nodejs/node/pull/22340 Refs: https://github.com/nodejs/build/issues/1443 Refs: https://github.com/nodejs/reliability/issues/12 Refs: https://github.com/nodejs/build/issues/1453 Refs: https://chromium-review.googlesource.com/c/993812/ Reviewed-By: Richard Lau Reviewed-By: João Reis Reviewed-By: Matheus Marchini Reviewed-By: Luigi Pinca Reviewed-By: Jon Moss Reviewed-By: Ruben Bridgewater Reviewed-By: James M Snell --- common.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index f2c474e6524286..1940e3fabbced4 100644 --- a/common.gypi +++ b/common.gypi @@ -29,7 +29,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.14', + 'v8_embedder_string': '-node.15', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1,