mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
fixup! add test patch
This commit is contained in:
2
.gitattributes
vendored
2
.gitattributes
vendored
@@ -2,6 +2,8 @@
|
||||
# files to be checked out with LF endings even if core.autocrlf is true.
|
||||
*.patch text eol=lf
|
||||
patches/**/.patches merge=union
|
||||
# Target file for patch has CRLF line endings
|
||||
patches/nan/apply_allcan_read_write_test.patch eol=crlf
|
||||
|
||||
# Source code and markdown files should always use LF as line ending.
|
||||
*.c text eol=lf
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alice Zhao <alice@makenotion.com>
|
||||
Date: Thu, 20 Jun 2024 14:50:13 -0700
|
||||
Subject: Check for NODE_21_0_MODULE_VERSION
|
||||
Subject: test: patch CRLF test file for allcan_read_write patch
|
||||
|
||||
Refs https://chromium-review.googlesource.com/c/v8/v8/+/5006387
|
||||
Should be upstreamed.
|
||||
Refs https://chromium-review.googlesource.com/c/v8/v8/+/5006387
|
||||
Should be upstreamed.
|
||||
|
||||
Module version checks are made against 119 since that is the current assigned version
|
||||
for Electron 28 in https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json.
|
||||
The version should be updateed to the one assinged for Electron 29 when it is available.
|
||||
|
||||
Steps for upstreaming this patch:
|
||||
|
||||
- Get a new module version assigned for Electron 29 in nodejs/node
|
||||
- Update NODE_21_0_MODULE_VERSION to the new version number
|
||||
- Upstream patch to nodejs/nan before Electron 29 is branched
|
||||
This patch is seperated from the apply_allcan_read_write.patch
|
||||
because the file itself has CRLF line endings and need to be patched
|
||||
seperately. When this patch is removed, also remove the eol=crlf
|
||||
exception in .gitattributes.
|
||||
|
||||
diff --git a/test/js/methodswithdata-test.js b/test/js/methodswithdata-test.js
|
||||
index 9f4fc5246f1ca3d8faadc9a72d49e14a6a190e32..795538510431fb3b633be37f916d4ce1955c808a 100644
|
||||
|
||||
Reference in New Issue
Block a user