Skip to content

Commit fd4fe73

Browse files
Trottmaclover7
Trott
authored and
maclover7
committed
remove dont-land-on-v4.x
Nothing will ever land on 4.x ever again, so there's no need for the dont-land-on-v4.x label. After this PR lands, hopefully it can be removed from the GitHub interface. PR-URL: #187 Reviewed-By: Jon Moss <me@jonathanmoss.me>
1 parent a1cf38f commit fd4fe73

File tree

2 files changed

+23
-33
lines changed

2 files changed

+23
-33
lines changed

‎lib/node-labels.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ const subSystemLabelsMap = new Map([
2121
[/^src\/timer_/, ['c++', 'timers']],
2222
[/^src\/(?:CNNICHashWhitelist|node_root_certs|tls_)/, ['c++', 'tls']],
2323
[/^src\/tty_/, ['c++', 'tty']],
24-
[/^src\/node_url/, ['c++', 'url-whatwg', 'dont-land-on-v4.x']],
24+
[/^src\/node_url/, ['c++', 'url-whatwg']],
2525
[/^src\/node_util/, ['c++', 'util']],
2626
[/^src\/(?:node_v8|v8abbr)/, ['c++', 'V8 Engine']],
2727
[/^src\/node_contextify/, ['c++', 'vm']],
2828
[/^src\/.*win32.*/, ['c++', 'windows']],
2929
[/^src\/node_zlib/, ['c++', 'zlib']],
3030
[/^src\/tracing/, ['c++', 'tracing']],
31-
[/^src\/node_api/, ['c++', 'n-api', 'dont-land-on-v4.x']],
32-
[/^src\/node_http2/, ['c++', 'http2', 'dont-land-on-v4.x', 'dont-land-on-v6.x']],
31+
[/^src\/node_api/, ['c++', 'n-api']],
32+
[/^src\/node_http2/, ['c++', 'http2', 'dont-land-on-v6.x']],
3333

3434
// don't label python files as c++
3535
[/^src\/.+\.py$/, 'lib / src'],
3636

3737
// properly label changes to v8 inspector integration-related files
38-
[/^src\/inspector_/, ['c++', 'inspector', 'dont-land-on-v4.x']],
38+
[/^src\/inspector_/, ['c++', 'inspector']],
3939

4040
// don't want to label it a c++ update when we're "only" bumping the Node.js version
4141
[/^src\/(?!node_version\.h)/, 'c++'],
@@ -72,8 +72,8 @@ const subSystemLabelsMap = new Map([
7272
[/^deps\/uv\//, 'libuv'],
7373
[/^deps\/v8\/tools\/gen-postmortem-metadata\.py/, ['V8 Engine', 'post-mortem']],
7474
[/^deps\/v8\//, 'V8 Engine'],
75-
[/^deps\/nghttp2\/nghttp2\.gyp/, ['build', 'http2', 'dont-land-on-v4.x', 'dont-land-on-v6.x']],
76-
[/^deps\/nghttp2\//, ['http2', 'dont-land-on-v4.x', 'dont-land-on-v6.x']],
75+
[/^deps\/nghttp2\/nghttp2\.gyp/, ['build', 'http2', 'dont-land-on-v6.x']],
76+
[/^deps\/nghttp2\//, ['http2', 'dont-land-on-v6.x']],
7777
[/^deps\/([^/]+)/, '$1'],
7878

7979
/* JS subsystems */
@@ -86,8 +86,8 @@ const subSystemLabelsMap = new Map([
8686
[/^lib\/\w+\/v8_prof_/, 'tools'],
8787
[/^lib\/\w+\/socket_list/, 'net'],
8888
[/^lib\/\w+\/streams$/, 'stream'],
89-
[/^lib\/.*http2/, ['http2', 'dont-land-on-v4.x', 'dont-land-on-v6.x']],
90-
[/^lib\/internal\/url\.js$/, ['url-whatwg', 'dont-land-on-v4.x']],
89+
[/^lib\/.*http2/, ['http2', 'dont-land-on-v6.x']],
90+
[/^lib\/internal\/url\.js$/, ['url-whatwg']],
9191
// All other lib/ files map directly
9292
[/^lib\/_(\w+)_\w+\.js?$/, '$1'], // e.g. _(stream)_wrap
9393
[/^lib(\/internal)?\/(\w+)\.js?$/, '$2'], // other .js files
@@ -109,10 +109,10 @@ const exclusiveLabelsMap = new Map([
109109
[/^test\/doctool\//, ['test', 'doc', 'tools']],
110110
[/^test\/timers\//, ['test', 'timers']],
111111
[/^test\/pseudo-tty\//, ['test', 'tty']],
112-
[/^test\/inspector\//, ['test', 'inspector', 'dont-land-on-v4.x']],
113-
[/^test\/cctest\/test_inspector/, ['test', 'inspector', 'dont-land-on-v4.x']],
114-
[/^test\/cctest\/test_url/, ['test', 'url-whatwg', 'dont-land-on-v4.x']],
115-
[/^test\/addons-napi\//, ['test', 'n-api', 'dont-land-on-v4.x']],
112+
[/^test\/inspector\//, ['test', 'inspector']],
113+
[/^test\/cctest\/test_inspector/, ['test', 'inspector']],
114+
[/^test\/cctest\/test_url/, ['test', 'url-whatwg']],
115+
[/^test\/addons-napi\//, ['test', 'n-api']],
116116
[/^test\/async-hooks\//, ['test', 'async_hooks']],
117117

118118
[/^test\//, 'test'],
@@ -121,7 +121,7 @@ const exclusiveLabelsMap = new Map([
121121
[/^doc\/api\/modules.md$/, ['doc', 'module']],
122122
// n-api is treated separately since it is not a JS core module but is still
123123
// considered a subsystem of sorts
124-
[/^doc\/api\/n-api.md$/, ['doc', 'n-api', 'dont-land-on-v4.x']],
124+
[/^doc\/api\/n-api.md$/, ['doc', 'n-api']],
125125
// automatically tag JS subsystem-specific API doc changes
126126
[/^doc\/api\/(\w+)\.md$/, ['doc', '$1']],
127127

‎test/unit/node-labels.test.js

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const srcCases = [
110110
'tls_wrap.cc',
111111
'tls_wrap.h'] ],
112112
[ 'tty', ['tty_wrap.cc', 'tty_wrap.h'] ],
113-
[ ['url-whatwg', 'dont-land-on-v4.x'],
113+
[ ['url-whatwg'],
114114
['node_url.cc', 'node_url.h'] ],
115115
[ 'util', ['node_util.cc'] ],
116116
[ 'V8 Engine', ['node_v8.cc', 'v8abbr.h'] ],
@@ -168,7 +168,7 @@ tap.test('label: "inspector" when ./src/inspector_* has been changed', (t) => {
168168
'src/inspector_socket.cc'
169169
])
170170

171-
t.same(labels, ['c++', 'inspector', 'dont-land-on-v4.x'])
171+
t.same(labels, ['c++', 'inspector'])
172172

173173
t.end()
174174
})
@@ -419,16 +419,6 @@ tap.test('label: build label (windows)', (t) => {
419419
t.end()
420420
})
421421

422-
tap.test('label: dont-land-on labels for WHATWG URL', (t) => {
423-
const labels = nodeLabels.resolveLabels([
424-
'lib/internal/url.js'
425-
])
426-
427-
t.same(labels, ['url-whatwg', 'dont-land-on-v4.x'])
428-
429-
t.end()
430-
})
431-
432422
tap.test('label: doc label for non-subsystem API doc changes', (t) => {
433423
const labels = nodeLabels.resolveLabels([
434424
'doc/api/_toc.md',
@@ -502,11 +492,11 @@ const specificTests = [
502492
[ 'addons', ['addons/async-hello-world/binding.cc'] ],
503493
[ 'debugger', ['debugger/test-debugger-repl.js'] ],
504494
[ ['doc', 'tools'], ['doctool/test-doctool-html.js'] ],
505-
[ ['inspector', 'dont-land-on-v4.x'],
495+
[ ['inspector'],
506496
['inspector/test-inspector.js', 'cctest/test_inspector_socket.cc'] ],
507497
[ 'timers', ['timers/test-timers-reliability.js'] ],
508498
[ 'tty', ['pseudo-tty/stdin-setrawmode.js'] ],
509-
[ ['url-whatwg', 'dont-land-on-v4.x'],
499+
[ ['url-whatwg'],
510500
['cctest/test_url.cc'] ]
511501
]
512502
for (const info of specificTests) {
@@ -567,11 +557,11 @@ for (const info of specificTools) {
567557
[
568558
[ ['V8 Engine', 'post-mortem'],
569559
['deps/v8/tools/gen-postmortem-metadata.py'] ],
570-
[ ['c++', 'n-api', 'dont-land-on-v4.x'],
560+
[ ['c++', 'n-api'],
571561
['src/node_api.cc', 'src/node_api.h', 'src/node_api_types.h'] ],
572-
[ ['test', 'n-api', 'dont-land-on-v4.x'],
562+
[ ['test', 'n-api'],
573563
['test/addons-napi/foo'] ],
574-
[ ['doc', 'n-api', 'dont-land-on-v4.x'],
564+
[ ['doc', 'n-api'],
575565
['doc/api/n-api.md'] ]
576566
].forEach((info) => {
577567
const labels = info[0]
@@ -615,16 +605,16 @@ tap.test('label: "build" when ./android-configure has been changed', (t) => {
615605
});
616606

617607
[
618-
[ ['http2', 'dont-land-on-v4.x', 'dont-land-on-v6.x'],
608+
[ ['http2', 'dont-land-on-v6.x'],
619609
['lib/http2.js',
620610
'lib/internal/http2/core.js',
621611
'deps/nghttp2/lib/nghttp2_buf.c'] ],
622-
[ ['c++', 'http2', 'dont-land-on-v4.x', 'dont-land-on-v6.x'],
612+
[ ['c++', 'http2', 'dont-land-on-v6.x'],
623613
['src/node_http2.cc',
624614
'src/node_http2.h',
625615
'src/node_http2_core.h',
626616
'src/node_http2_core-inl.h'] ],
627-
[ ['build', 'http2', 'dont-land-on-v4.x', 'dont-land-on-v6.x'],
617+
[ ['build', 'http2', 'dont-land-on-v6.x'],
628618
['deps/nghttp2/nghttp2.gyp'] ],
629619
[ ['doc', 'http2'], ['doc/api/http2.md'] ]
630620
].forEach((info) => {

0 commit comments

Comments
 (0)